]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1213'
authorDavid Goulet <dgoulet@torproject.org>
Mon, 19 Aug 2019 13:49:33 +0000 (09:49 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 19 Aug 2019 13:49:33 +0000 (09:49 -0400)

Trivial merge