[tor-commits] [tor/release-0.3.2] Partial revert of 2b48b5363f9aa5bd1 -- didn't mean to commit this