[tor-commits] [tor/release-0.4.1] Merge branch 'ticket31343_035' into ticket31343_040