]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/696'
authorDavid Goulet <dgoulet@torproject.org>
Wed, 20 Feb 2019 16:29:55 +0000 (11:29 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 20 Feb 2019 16:29:55 +0000 (11:29 -0500)

Trivial merge