[tor-commits] [tor/release-0.4.0] Merge branch 'bug29599_029' into bug29599_033