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

Trivial merge