]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1683'
authorDavid Goulet <dgoulet@torproject.org>
Mon, 27 Jan 2020 17:04:25 +0000 (12:04 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 27 Jan 2020 17:04:25 +0000 (12:04 -0500)

Trivial merge