]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
authorDavid Goulet <dgoulet@torproject.org>
Thu, 28 Jan 2021 17:10:39 +0000 (12:10 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 28 Jan 2021 17:10:39 +0000 (12:10 -0500)

Trivial merge