* Various bug fixes around Tor support