Merge branch 'master' into develop
Change setup.py download_urls to only point to gitweb.torproject.org.
Update PyNaCl requirement in setup.py.
Fix extra newlines in byte histories in extrainfo descs.
Merge branch 'release-0.0.5'