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

[nickm@xxxxxxxxxxxxxx]

commit fb1c191e54e1c19b1beec90ed1bcd3bc135bf4b8
Merge: 6155f7669 5a21b2708
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Oct 31 11:43:14 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23693 | 6 ++++++
 src/or/config.c  | 1 +
 2 files changed, 7 insertions(+)

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