[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm@xxxxxxxxxxxxxx]

commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jan 5 16:41:34 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket24681 | 6 ++++++
 doc/tor.1.txt       | 3 ++-
 src/or/config.c     | 9 ++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)




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