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