Merged with threading branch
Merge branch 'master' of github.com:benjkelley/torscraper