]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1385'
authorDavid Goulet <dgoulet@torproject.org>
Wed, 2 Oct 2019 18:15:31 +0000 (14:15 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 2 Oct 2019 18:15:31 +0000 (14:15 -0400)

Trivial merge