]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1099'
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 12 Jun 2019 10:02:49 +0000 (13:02 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 12 Jun 2019 10:02:49 +0000 (13:02 +0300)

Trivial merge