[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

[nickm at torproject.org]

commit 553c36d15354c4ffa90ef995f4a0b334b352fa45
Merge: 9b2e0604a 3147cbba5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 12 13:48:48 2020 -0500

    Merge branch 'maint-0.4.3'

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