]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1172'
authorDavid Goulet <dgoulet@torproject.org>
Thu, 8 Aug 2019 16:26:59 +0000 (12:26 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 8 Aug 2019 16:26:59 +0000 (12:26 -0400)

Trivial merge