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

Trivial merge