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

Trivial merge