[tor-commits] [tor/master] Merge branch 'bug22677'

[nickm@xxxxxxxxxxxxxx]

commit 53c82c0821737ce76bb99a75b5f309d0b2d715ba
Merge: 18f3f1ffa 69222fe87
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Aug 24 09:18:03 2017 -0400

    Merge branch 'bug22677'

 changes/bug22677 | 3 +++
 doc/tor.1.txt    | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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