Merge branch 'master' of git://github.com/lance0/tor-download-web.git