]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-gitlab/mr/270' into maint-0.4.5
authorDavid Goulet <dgoulet@torproject.org>
Thu, 21 Jan 2021 19:58:31 +0000 (14:58 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 21 Jan 2021 19:58:31 +0000 (14:58 -0500)

Trivial merge