consensus parser
Merge branch 'master' of https://github.com/drgowen/torscripts

Conflicts:
	torsetup.py