]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.0' into release-0.4.0
authorGeorge Kadianakis <desnacked@riseup.net>
Mon, 15 Apr 2019 10:56:48 +0000 (13:56 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Mon, 15 Apr 2019 10:56:48 +0000 (13:56 +0300)

Trivial merge