Merge branch 'maint-0.4.5'
commit2d68fdc94c78906c393f51661429575033362701
authorAlexander Færøy <ahf@torproject.org>
Wed, 16 Dec 2020 20:29:19 +0000 (16 20:29 +0000)
committerAlexander Færøy <ahf@torproject.org>
Wed, 16 Dec 2020 20:29:19 +0000 (16 20:29 +0000)
tree87214cf23ed3c1fc737c5ecb14fa744d5039cfe8
parent8b2d32435d626d878ddeb2348262d3efcdae8cbf
parent7998ea2f18dafc283b6fa6e66056d07d4f5963d3
Merge branch 'maint-0.4.5'
doc/man/tor.1.txt