Merge branch 'maint-0.4.6' into main
commitb109161c8f1c2acac7eee32ad86cc727975eeb08
authorAlexander Færøy <ahf@torproject.org>
Tue, 2 Nov 2021 15:27:08 +0000 (2 15:27 +0000)
committerAlexander Færøy <ahf@torproject.org>
Tue, 2 Nov 2021 15:27:08 +0000 (2 15:27 +0000)
tree9eb11ad227b8921db0450edc9a7c719cafdb5b3f
parentee38ec02f36906f344e4408c6b7a44ef435e1625
parent9922116388b9904f248f8bfc4d013f4fd38c7972
Merge branch 'maint-0.4.6' into main
doc/man/tor.1.txt