]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1290'
authorDavid Goulet <dgoulet@torproject.org>
Wed, 4 Sep 2019 14:33:49 +0000 (10:33 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 4 Sep 2019 14:33:49 +0000 (10:33 -0400)

Trivial merge