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