[tor-commits] [tor/release-0.3.5] Merge branch 'bug28348_034' into bug28348_035