[tor-commits] [tor/release-0.2.4] back out most of 1d0ba9a