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