[tor-commits] [tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3

[nickm at torproject.org]

commit 3147cbba52c3986c3f59101a7199dc73076d2b00
Merge: e0ea7407a 0ab859aab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 12 13:48:39 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3

 changes/ticket33188 |   5 +
 doc/tor.1.txt       | 630 ++++++++++++++++++++++++++--------------------------
 2 files changed, 326 insertions(+), 309 deletions(-)