Fixes for Travis-CI and Tor build scripts