This reverts commit e4b9c58a. The bug we were working around has been fixed in Tor 0.3.0.7, that this branch installs.