]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/692' into maint-0.4.0
authorDavid Goulet <dgoulet@torproject.org>
Tue, 26 Feb 2019 15:47:54 +0000 (10:47 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 26 Feb 2019 15:47:54 +0000 (10:47 -0500)

Trivial merge