commit 442e0caea2910b43616560e8d95cd4138c377257 Merge: 6fbb9af96 7d2b6cace Author: teor <teor@torproject.org> Date: Fri Apr 3 14:44:34 2020 +1000 Merge branch 'maint-0.4.3' doc/tor.1.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)