]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1633'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 14 Jan 2020 19:03:21 +0000 (14:03 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 14 Jan 2020 19:03:21 +0000 (14:03 -0500)

Trivial merge