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

Trivial merge