Merge branch 'maint-0.4.6'
commit36e6ad6c7b8c8205cda5763eff2ec535e788b1a0
authorDavid Goulet <dgoulet@torproject.org>
Wed, 3 Nov 2021 13:53:35 +0000 (3 09:53 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 3 Nov 2021 13:53:35 +0000 (3 09:53 -0400)
tree4cccc47860a3b91eb7181faaf188ddeda41c49a3
parent44671995d10c863d3e7967f8f10d2b599ebfe2e6
parent83f8fe05e8f398f8f1a403b159284db5952d17de
Merge branch 'maint-0.4.6'
doc/man/tor.1.txt