Windows/Linux fixes to reflect the simplified build process for fteproxy 0.2.12
Merge branch 'master' of github.com:kpdyer/tor-browser-bundle