Improve Tor support