various fixes for 0.2.19, which resolve issues with the Tor nightly builds