Merge remote-tracking branch 'tor-gitlab/mr/474' into main
commitf6600377b495c276cbaf423d9c8907abd4cb3c82
authorAlexander Færøy <ahf@torproject.org>
Tue, 2 Nov 2021 15:28:56 +0000 (2 15:28 +0000)
committerAlexander Færøy <ahf@torproject.org>
Tue, 2 Nov 2021 15:28:56 +0000 (2 15:28 +0000)
tree5b331edebb32463cb98bb2611d172c4753ad1c12
parentb109161c8f1c2acac7eee32ad86cc727975eeb08
parent7084ec871070e1f01a48b7735367b94abe1feb21
Merge remote-tracking branch 'tor-gitlab/mr/474' into main
doc/man/tor.1.txt