]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1740'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 18 Feb 2020 13:46:52 +0000 (08:46 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 18 Feb 2020 13:46:52 +0000 (08:46 -0500)

Trivial merge