]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1298'
authorDavid Goulet <dgoulet@torproject.org>
Mon, 9 Sep 2019 15:05:51 +0000 (11:05 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 9 Sep 2019 15:05:51 +0000 (11:05 -0400)

Trivial merge