Merge branch 'master' of ssh.github.com:cortesi/mitmproxy

CHANGELOG

@@ -1,19 +1,19 @@
-28 January 2014: mitmprolxy 0.10:
+28 January 2014: mitmproxy 0.10:
 	
-	* Support for multiple scripts and multiple script arguments
+    * Support for multiple scripts and multiple script arguments
 
-	* Easy certificate install through the in-proxy web app, which is now
-	enabled by default
+    * Easy certificate install through the in-proxy web app, which is now
+      enabled by default
 
-	* Forward proxy mode, that forwards proxy requests to an upstream HTTP server
+    * Forward proxy mode, that forwards proxy requests to an upstream HTTP server
 
-	* Reverse proxy now works with SSL
+    * Reverse proxy now works with SSL
 
-	* Search within a request/response using the "/" and "n" shortcut keys
+    * Search within a request/response using the "/" and "n" shortcut keys
 
-	* A view that beatifies CSS files if cssutils is available
+    * A view that beatifies CSS files if cssutils is available
 
-	* Bug fix, documentation improvments, and more.
+    * Bug fix, documentation improvements, and more.
 
 
 25 August 2013: mitmproxy 0.9.2:

release/release-checklist

@@ -3,10 +3,13 @@
 
     mitmproxy/libmproxy/version.py
     mitmproxy/requirements.txt
+    mitmproxy/test/requirements.txt
     netlib/netlib/version.py
     netlib/requirements.txt
+    netlib/test/requirements.txt
     pathod/netlib/version.py
     pathod/requirements.txt
+    pathod/test/requirements.txt
 
 
 - Render the docs:

requirements.txt

@@ -5,8 +5,6 @@ Pillow>=2.3.0,<2.4
 Werkzeug>=0.8.3
 lxml>=3.2.1
 netlib>=0.10
-nose>=1.3.0
-mock>=1.0.1
 pathod>=0.9.2
 pyOpenSSL>=0.13
 pyasn1>=0.1.7
@@ -14,4 +12,4 @@ requests>=1.2.2
 urwid>=1.1.1
 wsgiref>=0.1.2
 jsbeautifier>=1.4.0
-cssutils>=1.0,<1.1
+cssutils>=1.0,<1.1