]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1113'
authorDavid Goulet <dgoulet@torproject.org>
Wed, 19 Jun 2019 11:47:03 +0000 (07:47 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 19 Jun 2019 11:47:03 +0000 (07:47 -0400)

Trivial merge