]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/415' into maint-0.3.5
authorDavid Goulet <dgoulet@torproject.org>
Tue, 30 Oct 2018 15:36:36 +0000 (11:36 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 30 Oct 2018 15:36:36 +0000 (11:36 -0400)

Trivial merge