]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1153'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 23 Jul 2019 13:43:36 +0000 (09:43 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 23 Jul 2019 13:43:36 +0000 (09:43 -0400)

Trivial merge