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

[nickm@xxxxxxxxxxxxxx]

commit 8b46372f264450cb2a8876254c2ba4d0a64eb6dc
Merge: 5888db496 d99e7cebb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jan 13 13:26:23 2020 -0500

    Merge branch 'pr_1643_squashed'

 changes/ticket32846 |    3 +
 doc/tor.1.txt       | 1276 ++++++++++++++++++++++++++-------------------------
 2 files changed, 649 insertions(+), 630 deletions(-)

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