]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-gitlab/mr/188'
authorDavid Goulet <dgoulet@torproject.org>
Mon, 2 Nov 2020 18:09:15 +0000 (13:09 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 2 Nov 2020 18:09:15 +0000 (13:09 -0500)

Trivial merge