[tor-commits] [tor/release-0.2.2] Tweak bug2355_revert at suggestion from Roger