]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1311'
authorDavid Goulet <dgoulet@torproject.org>
Wed, 11 Sep 2019 13:36:28 +0000 (09:36 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 11 Sep 2019 13:36:28 +0000 (09:36 -0400)

Trivial merge