[tor-commits] [tor/release-0.3.5] Merge branch 'bug30781_029' into bug30781_034