[tor-commits] [tor/master] Merge remote-tracking branch 'weasel/bug19504'

[nickm@xxxxxxxxxxxxxx]

commit 11ba7f00371ef3ed7b9fd353aad4e3e672239a40
Merge: ff5b10c 869e568
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jun 29 16:18:00 2016 -0400

    Merge remote-tracking branch 'weasel/bug19504'

 changes/bug19504 | 3 +++
 doc/tor.1.txt    | 7 +++++++
 2 files changed, 10 insertions(+)

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