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