commit 0ec08b06439e78cd7c2557ef39163949c62f7fbf Merge: c81901fd39 86f880d756 Author: Alexander Færøy ahf@torproject.org Date: Thu Oct 14 13:03:03 2021 +0000

Merge remote-tracking branch 'tor-gitlab/mr/432' into main

doc/man/tor.1.txt | 100 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 29 deletions(-)