Merge branch 'tor-github/pr/867' into maint-0.4.0
commit42aae0e693be6f96eef9d124867c7e0915b6ab78
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 3 Apr 2019 14:59:02 +0000 (3 17:59 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 3 Apr 2019 14:59:02 +0000 (3 17:59 +0300)
tree137015a9e52427915b11c255dc479673ed457fc3
parent828f1829c8082abd7e3f9221b63d2367ff4b9639
parent194b25f0c7043b2485bb90da6fb24c0e96957875
Merge branch 'tor-github/pr/867' into maint-0.4.0