]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1165'
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 24 Jul 2019 09:29:57 +0000 (12:29 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 24 Jul 2019 09:29:57 +0000 (12:29 +0300)

Trivial merge