]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1054'
authorDavid Goulet <dgoulet@torproject.org>
Thu, 30 May 2019 13:59:21 +0000 (09:59 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 30 May 2019 13:59:21 +0000 (09:59 -0400)

Trivial merge