]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/309' into maint-0.4.5
authorAlexander Færøy <ahf@torproject.org>
Mon, 22 Feb 2021 19:12:53 +0000 (19:12 +0000)
committerAlexander Færøy <ahf@torproject.org>
Mon, 22 Feb 2021 19:12:53 +0000 (19:12 +0000)

Trivial merge