[tor-commits] [tor/release-0.4.0] Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge