[tor-commits] [tor/release-0.4.1] Merge branch 'bug33673_035' into bug33673_041