]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1239'
authorDavid Goulet <dgoulet@torproject.org>
Mon, 26 Aug 2019 18:35:27 +0000 (14:35 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 26 Aug 2019 18:35:27 +0000 (14:35 -0400)

Trivial merge