[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

[teor at torproject.org]

commit 3a86a4fe67f7531176c4d93f6094e1ae980d4425
Merge: 6c2b153db 725efb7c9
Author: teor <teor at torproject.org>
Date:   Thu Mar 19 18:03:21 2020 +1000

    Merge branch 'maint-0.4.3' into release-0.4.3

 doc/tor.1.txt | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)