[tor-commits] [tor/release-0.4.0] Merge branch 'ticket31374_029' into ticket31374_035