[tor-commits] [tor/release-0.3.5] Merge branch 'ticket31372_029' into ticket31372_035