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

Trivial merge