]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-gitlab/mr/234' into maint-0.4.5
authorAlexander Færøy <ahf@torproject.org>
Wed, 16 Dec 2020 20:38:23 +0000 (20:38 +0000)
committerAlexander Færøy <ahf@torproject.org>
Wed, 16 Dec 2020 20:38:23 +0000 (20:38 +0000)

Trivial merge