commit 628a444242cda3b13b8e0b08a700eee92aeb3a39 Merge: aa94f81ad 7d2b6cace Author: teor <teor@torproject.org> Date: Fri Apr 3 14:44:30 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 doc/tor.1.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)