]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/196' into maint-0.4.3
authorAlexander Færøy <ahf@torproject.org>
Thu, 19 Nov 2020 17:43:44 +0000 (17:43 +0000)
committerAlexander Færøy <ahf@torproject.org>
Thu, 19 Nov 2020 17:43:44 +0000 (17:43 +0000)

Trivial merge