[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0