Simplify the class definition
Merge remote-tracking branch 'aagbsn/fix/simplify_class'

Conflicts:
	txtorproxyhttp/proxy.py