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