]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1609'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 17 Dec 2019 14:26:49 +0000 (09:26 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 17 Dec 2019 14:26:49 +0000 (09:26 -0500)

Trivial merge