]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1171' into maint-0.4.1
authorDavid Goulet <dgoulet@torproject.org>
Thu, 25 Jul 2019 13:02:53 +0000 (09:02 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 25 Jul 2019 13:02:53 +0000 (09:02 -0400)

Trivial merge