]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1158' into maint-0.4.1
authorDavid Goulet <dgoulet@torproject.org>
Tue, 23 Jul 2019 13:39:43 +0000 (09:39 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 23 Jul 2019 13:39:43 +0000 (09:39 -0400)

Trivial merge