]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1292'
authorGeorge Kadianakis <desnacked@riseup.net>
Thu, 5 Sep 2019 14:06:58 +0000 (17:06 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Thu, 5 Sep 2019 14:06:58 +0000 (17:06 +0300)

Trivial merge