]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/501'
authorDavid Goulet <dgoulet@torproject.org>
Tue, 13 Nov 2018 15:48:23 +0000 (10:48 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 13 Nov 2018 15:48:23 +0000 (10:48 -0500)

Trivial merge