Merge branch 'cli-auto-exit' of https://github.com/kkka/onionshare into kkka-cli-auto-exit

Conflicts:
	onionshare/onionshare.py

onionshare/onionshare.py

@@ -254,16 +254,13 @@ def main():
     print strings._("ctrlc_to_stop")
 
     # wait for app to close
-    running = True
+    try:
-    while running:
+        t.join()
-        try:
+    except KeyboardInterrupt:
-            time.sleep(0.5)
+        web.stop(app.port)
-        except KeyboardInterrupt:
+    finally:
-            running = False
+        # shutdown
-            web.stop(app.port)
+        app.cleanup()
-
-    # shutdown
-    app.cleanup()
 
 if __name__ == '__main__':
     main()