commit 7998ea2f18dafc283b6fa6e66056d07d4f5963d3 Merge: 4a77aa6e82 34baa1bdc3 Author: Alexander Færøy ahf@torproject.org Date: Wed Dec 16 20:29:03 2020 +0000

Merge remote-tracking branch 'tor-gitlab/mr/237' into maint-0.4.5

changes/ticket40188 | 4 ++++ doc/man/tor.1.txt | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-)