]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/954'
authorDavid Goulet <dgoulet@torproject.org>
Fri, 3 May 2019 17:11:03 +0000 (13:11 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Fri, 3 May 2019 17:11:03 +0000 (13:11 -0400)

Trivial merge