commit 94e4a6b4f6a96b5272c755fcec849bfe6b74e4ee Merge: 4d075e9994 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 release-0.4.6 changes/ticket40504 | 3 +++ doc/man/tor.1.txt | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)