]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1193'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 6 Aug 2019 11:42:20 +0000 (07:42 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 6 Aug 2019 11:42:20 +0000 (07:42 -0400)

Trivial merge