]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1555'
authorGeorge Kadianakis <desnacked@riseup.net>
Thu, 21 Nov 2019 11:03:44 +0000 (13:03 +0200)
committerGeorge Kadianakis <desnacked@riseup.net>
Thu, 21 Nov 2019 11:03:44 +0000 (13:03 +0200)

Trivial merge