]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/1114' into maint-0.4.1
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 26 Jun 2019 07:51:12 +0000 (10:51 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 26 Jun 2019 07:51:12 +0000 (10:51 +0300)

Trivial merge