]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1687'
authorDavid Goulet <dgoulet@torproject.org>
Thu, 30 Jan 2020 19:06:09 +0000 (14:06 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 30 Jan 2020 19:06:09 +0000 (14:06 -0500)

Trivial merge