commit bd61a36fde5b26a85f71d08521f1278c7fe9cfbd Merge: a93a9cfe2 688d1b3f0 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 1 09:47:45 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

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