commit b109161c8f1c2acac7eee32ad86cc727975eeb08 Merge: ee38ec02f3 9922116388 Author: Alexander Færøy ahf@torproject.org Date: Tue Nov 2 15:27:08 2021 +0000

Merge branch 'maint-0.4.6' into main

changes/ticket40504 | 3 +++ doc/man/tor.1.txt | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)