Merge branch 'master' into python3

Conflicts:
	wrw/cookie.py

diff --cc wrw/cookie.py
index 3a3c9164e427fb765c3331351cb6665a1cdd0685,4f5071a45552e92cd621184d64da1b43d06e692f..b66e293f62752f285bbc1e0acdd79cc00001477d
--- 1/wrw/cookie.py
--- 2/wrw/cookie.py
+++ b/wrw/cookie.py
@@@ -1,4 -1,5 +1,5 @@@
- import http.cookies
 -import Cookie, time
 -import proto
++import http.cookies, time
++from . import proto
  
  __all__ = ["cookies", "get", "add"]
  

diff --cc wrw/req.py
Simple merge

diff --cc wrw/session.py
Simple merge