[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm@xxxxxxxxxxxxxx]

commit b63cbec65e33602af5ba3e310b87fddb4ad75ab5
Merge: 74ce41d4d 736e7299c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Dec 11 16:51:58 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23985    | 9 +++++++++
 src/or/routerlist.c | 5 +++++
 2 files changed, 14 insertions(+)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits