]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1047'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 28 May 2019 18:59:07 +0000 (14:59 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 28 May 2019 18:59:07 +0000 (14:59 -0400)

Trivial merge