]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-gitlab/mr/321' into maint-0.4.5
authorDavid Goulet <dgoulet@torproject.org>
Wed, 24 Feb 2021 18:55:21 +0000 (13:55 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 24 Feb 2021 18:55:21 +0000 (13:55 -0500)

Trivial merge