[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug17621-try2' into maint-0.2.8

[nickm@xxxxxxxxxxxxxx]

commit d00d3f1c2858f71adfa315ee67d0c2191a793d2a
Merge: 163cee1 4a62d7a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu May 12 10:03:00 2016 -0400

    Merge remote-tracking branch 'arma/bug17621-try2' into maint-0.2.8

 changes/doc17621 |  3 +++
 doc/tor.1.txt    | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 60 insertions(+), 3 deletions(-)



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