[tor-commits] [tor/release-0.4.2] Merge branch 'bug32240_040' into bug32240_041