]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/867' into maint-0.4.0
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 3 Apr 2019 14:59:02 +0000 (17:59 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 3 Apr 2019 14:59:02 +0000 (17:59 +0300)

Trivial merge