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