[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5