Merge branch 'merge_kevinykchan'

Conflicts:
	wsproxy.py

Fix auth mode selection typo.

wsproxy.py

@@ -9,7 +9,7 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates
 
 '''
 
-import sys, socket, ssl
+import sys, socket, ssl, time
 from select import select
 from websocket import *
 
@@ -35,6 +35,8 @@ def do_proxy(client, target):
     socks = [client, target]
 
     while True:
+        time.sleep(0.01) # 10ms
+
         ins, outs, excepts = select(socks, socks, socks, 1)
         if excepts: raise Exception("Socket exception")