]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1912' into maint-0.3.5
authorDavid Goulet <dgoulet@torproject.org>
Fri, 12 Jun 2020 16:55:17 +0000 (12:55 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Fri, 12 Jun 2020 16:55:17 +0000 (12:55 -0400)

Trivial merge