Fix merge botch
Merge branch 'respect-fellow-hs' into hidden-id

Conflicts:
	onionshare/onionshare.py