commit 2d68fdc94c78906c393f51661429575033362701 Merge: 8b2d32435d 7998ea2f18 Author: Alexander Færøy <ahf@torproject.org> Date: Wed Dec 16 20:29:19 2020 +0000 Merge branch 'maint-0.4.5' changes/ticket40188 | 4 ++++ doc/man/tor.1.txt | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-)