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

[nickm at torproject.org]

commit 688d1b3f032b5a84ad5ada23fa8831c07bd76c75
Merge: 6891d1bbc d6186c743
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 1 09:47:37 2020 -0400

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

 changes/bug34299 | 3 +++
 doc/tor.1.txt    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)