]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/690'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 12 Feb 2019 18:04:25 +0000 (13:04 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 12 Feb 2019 18:04:25 +0000 (13:04 -0500)

Trivial merge