]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1067'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 4 Jun 2019 13:57:03 +0000 (09:57 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 4 Jun 2019 13:57:03 +0000 (09:57 -0400)

Trivial merge