Fix CLI version to automatically exit when the server is shut down.
Merge branch 'cli-auto-exit' of https://github.com/kkka/onionshare into kkka-cli-auto-exit

Conflicts:
	onionshare/onionshare.py
Merge branch 'kkka-cli-auto-exit'