219 files changed, 59 insertions, 375 deletions

diff --git a/mitmproxy/README.rst b/mitmproxy/README.rst
deleted file mode 100644
index 8ef92409..00000000
--- a/mitmproxy/README.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-|travis| |coveralls| |downloads| |latest_release| |python_versions|
-
-``mitmproxy`` is an interactive, SSL/TLS-capable man-in-the-middle proxy for HTTP
-with a console interface.
-
-``mitmdump`` is the command-line version of mitmproxy. Think tcpdump for HTTP.
-
-
-Features
---------
-
-- Intercept HTTP requests and responses and modify them on the fly.
-- Save complete HTTP conversations for later replay and analysis.
-- Replay the client-side of an HTTP conversations.
-- Replay HTTP responses of a previously recorded server.
-- Reverse proxy mode to forward traffic to a specified server.
-- Transparent proxy mode on OSX and Linux.
-- Make scripted changes to HTTP traffic using Python.
-- SSL/TLS certificates for interception are generated on the fly.
-- And much, much more.
-
-``mitmproxy`` is tested and developed on Mac OSX and Linux.
-On Windows, only mitmdump is supported, which does not have a graphical user interface.
-
-
-Documentation & Help
---------------------
-
-Documentation, tutorials and distribution packages can be found on the
-mitmproxy website.
-
-|mitmproxy_site|
-
-Installation Instructions are available in the documentation.
-
-|mitmproxy_docs|
-
-You can join our developer chat on Slack.
-
-|slack|
-
-
-.. |mitmproxy_site| image:: https://shields.mitmproxy.org/api/https%3A%2F%2F-mitmproxy.org-blue.svg
-    :target: https://mitmproxy.org/
-    :alt: mitmproxy.org
-
-.. |mitmproxy_docs| image:: https://readthedocs.org/projects/mitmproxy/badge/
-    :target: http://docs.mitmproxy.org/en/latest/
-    :alt: mitmproxy documentation
-
-.. |slack| image:: http://slack.mitmproxy.org/badge.svg
-    :target: http://slack.mitmproxy.org/
-    :alt: Slack Developer Chat
-
-.. |travis| image:: https://shields.mitmproxy.org/travis/mitmproxy/mitmproxy/master.svg
-    :target: https://travis-ci.org/mitmproxy/mitmproxy
-    :alt: Build Status
-
-.. |coveralls| image:: https://shields.mitmproxy.org/coveralls/mitmproxy/mitmproxy/master.svg
-    :target: https://coveralls.io/r/mitmproxy/mitmproxy
-    :alt: Coverage Status
-
-.. |downloads| image:: https://shields.mitmproxy.org/pypi/dm/mitmproxy.svg?color=orange
-    :target: https://pypi.python.org/pypi/mitmproxy
-    :alt: Downloads
-
-.. |latest_release| image:: https://shields.mitmproxy.org/pypi/v/mitmproxy.svg
-    :target: https://pypi.python.org/pypi/mitmproxy
-    :alt: Latest Version
-
-.. |python_versions| image:: https://shields.mitmproxy.org/pypi/pyversions/mitmproxy.svg
-    :target: https://pypi.python.org/pypi/mitmproxy
-    :alt: Supported Python versions
diff --git a/mitmproxy/mitmproxy/__init__.py b/mitmproxy/__init__.py
index e69de29b..e69de29b 100644
--- a/mitmproxy/mitmproxy/__init__.py
+++ b/mitmproxy/__init__.py
diff --git a/mitmproxy/mitmproxy/cmdline.py b/mitmproxy/cmdline.py
index fedd4f13..fedd4f13 100644
--- a/mitmproxy/mitmproxy/cmdline.py
+++ b/mitmproxy/cmdline.py
diff --git a/mitmproxy/mitmproxy/console/__init__.py b/mitmproxy/console/__init__.py
index e739ec61..e739ec61 100644
--- a/mitmproxy/mitmproxy/console/__init__.py
+++ b/mitmproxy/console/__init__.py
diff --git a/mitmproxy/mitmproxy/console/common.py b/mitmproxy/console/common.py
index c29ffddc..c29ffddc 100644
--- a/mitmproxy/mitmproxy/console/common.py
+++ b/mitmproxy/console/common.py
diff --git a/mitmproxy/mitmproxy/console/flowdetailview.py b/mitmproxy/console/flowdetailview.py
index f4b4262e..f4b4262e 100644
--- a/mitmproxy/mitmproxy/console/flowdetailview.py
+++ b/mitmproxy/console/flowdetailview.py
diff --git a/mitmproxy/mitmproxy/console/flowlist.py b/mitmproxy/console/flowlist.py
index c2201055..c2201055 100644
--- a/mitmproxy/mitmproxy/console/flowlist.py
+++ b/mitmproxy/console/flowlist.py
diff --git a/mitmproxy/mitmproxy/console/flowview.py b/mitmproxy/console/flowview.py
index f74ab140..f74ab140 100644
--- a/mitmproxy/mitmproxy/console/flowview.py
+++ b/mitmproxy/console/flowview.py
diff --git a/mitmproxy/mitmproxy/console/grideditor.py b/mitmproxy/console/grideditor.py
index a11c962c..a11c962c 100644
--- a/mitmproxy/mitmproxy/console/grideditor.py
+++ b/mitmproxy/console/grideditor.py
diff --git a/mitmproxy/mitmproxy/console/help.py b/mitmproxy/console/help.py
index 0c264ebf..0c264ebf 100644
--- a/mitmproxy/mitmproxy/console/help.py
+++ b/mitmproxy/console/help.py
diff --git a/mitmproxy/mitmproxy/console/options.py b/mitmproxy/console/options.py
index 5c9e0cc9..5c9e0cc9 100644
--- a/mitmproxy/mitmproxy/console/options.py
+++ b/mitmproxy/console/options.py
diff --git a/mitmproxy/mitmproxy/console/palettepicker.py b/mitmproxy/console/palettepicker.py
index 51ad0606..51ad0606 100644
--- a/mitmproxy/mitmproxy/console/palettepicker.py
+++ b/mitmproxy/console/palettepicker.py
diff --git a/mitmproxy/mitmproxy/console/palettes.py b/mitmproxy/console/palettes.py
index bd370181..bd370181 100644
--- a/mitmproxy/mitmproxy/console/palettes.py
+++ b/mitmproxy/console/palettes.py
diff --git a/mitmproxy/mitmproxy/console/pathedit.py b/mitmproxy/console/pathedit.py
index 4447070b..4447070b 100644
--- a/mitmproxy/mitmproxy/console/pathedit.py
+++ b/mitmproxy/console/pathedit.py
diff --git a/mitmproxy/mitmproxy/console/searchable.py b/mitmproxy/console/searchable.py
index cff1f0a1..cff1f0a1 100644
--- a/mitmproxy/mitmproxy/console/searchable.py
+++ b/mitmproxy/console/searchable.py
diff --git a/mitmproxy/mitmproxy/console/select.py b/mitmproxy/console/select.py
index 928a7ca5..928a7ca5 100644
--- a/mitmproxy/mitmproxy/console/select.py
+++ b/mitmproxy/console/select.py
diff --git a/mitmproxy/mitmproxy/console/signals.py b/mitmproxy/console/signals.py
index 6a439bf3..6a439bf3 100644
--- a/mitmproxy/mitmproxy/console/signals.py
+++ b/mitmproxy/console/signals.py
diff --git a/mitmproxy/mitmproxy/console/statusbar.py b/mitmproxy/console/statusbar.py
index 4cc63a54..4cc63a54 100644
--- a/mitmproxy/mitmproxy/console/statusbar.py
+++ b/mitmproxy/console/statusbar.py
diff --git a/mitmproxy/mitmproxy/console/tabs.py b/mitmproxy/console/tabs.py
index b5423038..b5423038 100644
--- a/mitmproxy/mitmproxy/console/tabs.py
+++ b/mitmproxy/console/tabs.py
diff --git a/mitmproxy/mitmproxy/console/window.py b/mitmproxy/console/window.py
index 47c284e4..47c284e4 100644
--- a/mitmproxy/mitmproxy/console/window.py
+++ b/mitmproxy/console/window.py
diff --git a/mitmproxy/mitmproxy/contentviews.py b/mitmproxy/contentviews.py
index 5335b59c..5335b59c 100644
--- a/mitmproxy/mitmproxy/contentviews.py
+++ b/mitmproxy/contentviews.py
diff --git a/mitmproxy/mitmproxy/contrib/README b/mitmproxy/contrib/README
index e5ce11da..e5ce11da 100644
--- a/mitmproxy/mitmproxy/contrib/README
+++ b/mitmproxy/contrib/README
diff --git a/mitmproxy/mitmproxy/contrib/__init__.py b/mitmproxy/contrib/__init__.py
index e69de29b..e69de29b 100644
--- a/mitmproxy/mitmproxy/contrib/__init__.py
+++ b/mitmproxy/contrib/__init__.py
diff --git a/mitmproxy/mitmproxy/contrib/jsbeautifier/__init__.py b/mitmproxy/contrib/jsbeautifier/__init__.py
index e319e8dd..e319e8dd 100644
--- a/mitmproxy/mitmproxy/contrib/jsbeautifier/__init__.py
+++ b/mitmproxy/contrib/jsbeautifier/__init__.py
diff --git a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd b/mitmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd
index e937b762..e937b762 100644
--- a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd
+++ b/mitmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd
diff --git a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/__init__.py b/mitmproxy/contrib/jsbeautifier/unpackers/__init__.py
index fcb5b07a..fcb5b07a 100644
--- a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/__init__.py
+++ b/mitmproxy/contrib/jsbeautifier/unpackers/__init__.py
diff --git a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/evalbased.py b/mitmproxy/contrib/jsbeautifier/unpackers/evalbased.py
index b17d926e..b17d926e 100644
--- a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/evalbased.py
+++ b/mitmproxy/contrib/jsbeautifier/unpackers/evalbased.py
diff --git a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py b/mitmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py
index aa4344a3..aa4344a3 100644
--- a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py
+++ b/mitmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py
diff --git a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py b/mitmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
index 9893f95f..9893f95f 100644
--- a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
+++ b/mitmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
diff --git a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/packer.py b/mitmproxy/contrib/jsbeautifier/unpackers/packer.py
index 4ada669e..4ada669e 100644
--- a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/packer.py
+++ b/mitmproxy/contrib/jsbeautifier/unpackers/packer.py
diff --git a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/urlencode.py b/mitmproxy/contrib/jsbeautifier/unpackers/urlencode.py
index 72d2bd1c..72d2bd1c 100644
--- a/mitmproxy/mitmproxy/contrib/jsbeautifier/unpackers/urlencode.py
+++ b/mitmproxy/contrib/jsbeautifier/unpackers/urlencode.py
diff --git a/mitmproxy/mitmproxy/contrib/tls/__init__.py b/mitmproxy/contrib/tls/__init__.py
index 4b540884..4b540884 100644
--- a/mitmproxy/mitmproxy/contrib/tls/__init__.py
+++ b/mitmproxy/contrib/tls/__init__.py
diff --git a/mitmproxy/mitmproxy/contrib/tls/_constructs.py b/mitmproxy/contrib/tls/_constructs.py
index 4cb7d382..4cb7d382 100644
--- a/mitmproxy/mitmproxy/contrib/tls/_constructs.py
+++ b/mitmproxy/contrib/tls/_constructs.py
diff --git a/mitmproxy/mitmproxy/contrib/tls/utils.py b/mitmproxy/contrib/tls/utils.py
index 4c917303..4c917303 100644
--- a/mitmproxy/mitmproxy/contrib/tls/utils.py
+++ b/mitmproxy/contrib/tls/utils.py
diff --git a/mitmproxy/mitmproxy/contrib/wbxml/ASCommandResponse.py b/mitmproxy/contrib/wbxml/ASCommandResponse.py
index 08d03445..08d03445 100644
--- a/mitmproxy/mitmproxy/contrib/wbxml/ASCommandResponse.py
+++ b/mitmproxy/contrib/wbxml/ASCommandResponse.py
diff --git a/mitmproxy/mitmproxy/contrib/wbxml/ASWBXML.py b/mitmproxy/contrib/wbxml/ASWBXML.py
index 926d18c0..926d18c0 100644
--- a/mitmproxy/mitmproxy/contrib/wbxml/ASWBXML.py
+++ b/mitmproxy/contrib/wbxml/ASWBXML.py
diff --git a/mitmproxy/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py b/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py
index c7a9e0a5..c7a9e0a5 100644
--- a/mitmproxy/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py
+++ b/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py
diff --git a/mitmproxy/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py b/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py
index 2f9d8717..2f9d8717 100644
--- a/mitmproxy/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py
+++ b/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py
diff --git a/mitmproxy/mitmproxy/contrib/wbxml/GlobalTokens.py b/mitmproxy/contrib/wbxml/GlobalTokens.py
index 41310fb1..41310fb1 100644
--- a/mitmproxy/mitmproxy/contrib/wbxml/GlobalTokens.py
+++ b/mitmproxy/contrib/wbxml/GlobalTokens.py
diff --git a/mitmproxy/mitmproxy/contrib/wbxml/InvalidDataException.py b/mitmproxy/contrib/wbxml/InvalidDataException.py
index 67f8ea93..67f8ea93 100644
--- a/mitmproxy/mitmproxy/contrib/wbxml/InvalidDataException.py
+++ b/mitmproxy/contrib/wbxml/InvalidDataException.py
diff --git a/mitmproxy/mitmproxy/contrib/wbxml/__init__.py b/mitmproxy/contrib/wbxml/__init__.py
index e69de29b..e69de29b 100644
--- a/mitmproxy/mitmproxy/contrib/wbxml/__init__.py
+++ b/mitmproxy/contrib/wbxml/__init__.py
diff --git a/mitmproxy/mitmproxy/controller.py b/mitmproxy/controller.py
index 9a059856..9a059856 100644
--- a/mitmproxy/mitmproxy/controller.py
+++ b/mitmproxy/controller.py
diff --git a/mitmproxy/mitmproxy/dump.py b/mitmproxy/dump.py
index 6dab2ddc..6dab2ddc 100644
--- a/mitmproxy/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
diff --git a/mitmproxy/mitmproxy/exceptions.py b/mitmproxy/exceptions.py
index f0ff81a2..f0ff81a2 100644
--- a/mitmproxy/mitmproxy/exceptions.py
+++ b/mitmproxy/exceptions.py
diff --git a/mitmproxy/mitmproxy/filt.py b/mitmproxy/filt.py
index aa62b717..aa62b717 100644
--- a/mitmproxy/mitmproxy/filt.py
+++ b/mitmproxy/filt.py
diff --git a/mitmproxy/mitmproxy/flow.py b/mitmproxy/flow.py
index ac0d0fbb..ac0d0fbb 100644
--- a/mitmproxy/mitmproxy/flow.py
+++ b/mitmproxy/flow.py
diff --git a/mitmproxy/mitmproxy/flow_export.py b/mitmproxy/flow_export.py
index 52145516..52145516 100644
--- a/mitmproxy/mitmproxy/flow_export.py
+++ b/mitmproxy/flow_export.py
diff --git a/mitmproxy/mitmproxy/flow_format_compat.py b/mitmproxy/flow_format_compat.py
index a7a95af3..a7a95af3 100644
--- a/mitmproxy/mitmproxy/flow_format_compat.py
+++ b/mitmproxy/flow_format_compat.py
diff --git a/mitmproxy/mitmproxy/main.py b/mitmproxy/main.py
index ef135754..ef135754 100644
--- a/mitmproxy/mitmproxy/main.py
+++ b/mitmproxy/main.py
diff --git a/mitmproxy/mitmproxy/models/__init__.py b/mitmproxy/models/__init__.py
index 653b19fd..653b19fd 100644
--- a/mitmproxy/mitmproxy/models/__init__.py
+++ b/mitmproxy/models/__init__.py
diff --git a/mitmproxy/mitmproxy/models/connections.py b/mitmproxy/models/connections.py
index d5920256..d5920256 100644
--- a/mitmproxy/mitmproxy/models/connections.py
+++ b/mitmproxy/models/connections.py
diff --git a/mitmproxy/mitmproxy/models/flow.py b/mitmproxy/models/flow.py
index 10255dad..10255dad 100644
--- a/mitmproxy/mitmproxy/models/flow.py
+++ b/mitmproxy/models/flow.py
diff --git a/mitmproxy/mitmproxy/models/http.py b/mitmproxy/models/http.py
index 394fe51a..394fe51a 100644
--- a/mitmproxy/mitmproxy/models/http.py
+++ b/mitmproxy/models/http.py
diff --git a/mitmproxy/mitmproxy/onboarding/__init__.py b/mitmproxy/onboarding/__init__.py
index e69de29b..e69de29b 100644
--- a/mitmproxy/mitmproxy/onboarding/__init__.py
+++ b/mitmproxy/onboarding/__init__.py
diff --git a/mitmproxy/mitmproxy/onboarding/app.py b/mitmproxy/onboarding/app.py
index ff5ed63c..ff5ed63c 100644
--- a/mitmproxy/mitmproxy/onboarding/app.py
+++ b/mitmproxy/onboarding/app.py
diff --git a/mitmproxy/mitmproxy/onboarding/static/bootstrap.min.css b/mitmproxy/onboarding/static/bootstrap.min.css
index f31489f9..f31489f9 100644
--- a/mitmproxy/mitmproxy/onboarding/static/bootstrap.min.css
+++ b/mitmproxy/onboarding/static/bootstrap.min.css
diff --git a/mitmproxy/mitmproxy/onboarding/static/fontawesome/css/font-awesome.css b/mitmproxy/onboarding/static/fontawesome/css/font-awesome.css
index 048cff97..048cff97 100644
--- a/mitmproxy/mitmproxy/onboarding/static/fontawesome/css/font-awesome.css
+++ b/mitmproxy/onboarding/static/fontawesome/css/font-awesome.css
diff --git a/mitmproxy/mitmproxy/onboarding/static/fontawesome/css/font-awesome.min.css b/mitmproxy/onboarding/static/fontawesome/css/font-awesome.min.css
index 449d6ac5..449d6ac5 100644
--- a/mitmproxy/mitmproxy/onboarding/static/fontawesome/css/font-awesome.min.css
+++ b/mitmproxy/onboarding/static/fontawesome/css/font-awesome.min.css
diff --git a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf b/mitmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf
index 8b0f54e4..8b0f54e4 100644
--- a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf
+++ b/mitmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf
diff --git a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot b/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot
index 7c79c6a6..7c79c6a6 100644
--- a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot
+++ b/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot
diff --git a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg b/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg
index 45fdf338..45fdf338 100644
--- a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg
+++ b/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg
diff --git a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf b/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf
index e89738de..e89738de 100644
--- a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf
+++ b/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf
diff --git a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff b/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff
index 8c1748aa..8c1748aa 100644
--- a/mitmproxy/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff
+++ b/mitmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff
diff --git a/mitmproxy/mitmproxy/onboarding/static/mitmproxy.css b/mitmproxy/onboarding/static/mitmproxy.css
index b390976a..b390976a 100644
--- a/mitmproxy/mitmproxy/onboarding/static/mitmproxy.css
+++ b/mitmproxy/onboarding/static/mitmproxy.css
diff --git a/mitmproxy/mitmproxy/onboarding/templates/frame.html b/mitmproxy/onboarding/templates/frame.html
index f00e1a66..f00e1a66 100644
--- a/mitmproxy/mitmproxy/onboarding/templates/frame.html
+++ b/mitmproxy/onboarding/templates/frame.html
diff --git a/mitmproxy/mitmproxy/onboarding/templates/index.html b/mitmproxy/onboarding/templates/index.html
index 1bcff1b8..1bcff1b8 100644
--- a/mitmproxy/mitmproxy/onboarding/templates/index.html
+++ b/mitmproxy/onboarding/templates/index.html
diff --git a/mitmproxy/mitmproxy/onboarding/templates/layout.html b/mitmproxy/onboarding/templates/layout.html
index 8726a788..8726a788 100644
--- a/mitmproxy/mitmproxy/onboarding/templates/layout.html
+++ b/mitmproxy/onboarding/templates/layout.html
diff --git a/mitmproxy/mitmproxy/platform/__init__.py b/mitmproxy/platform/__init__.py
index e1ff7c47..e1ff7c47 100644
--- a/mitmproxy/mitmproxy/platform/__init__.py
+++ b/mitmproxy/platform/__init__.py
diff --git a/mitmproxy/mitmproxy/platform/linux.py b/mitmproxy/platform/linux.py
index 38bfbe42..38bfbe42 100644
--- a/mitmproxy/mitmproxy/platform/linux.py
+++ b/mitmproxy/platform/linux.py
diff --git a/mitmproxy/mitmproxy/platform/osx.py b/mitmproxy/platform/osx.py
index afbc919b..afbc919b 100644
--- a/mitmproxy/mitmproxy/platform/osx.py
+++ b/mitmproxy/platform/osx.py
diff --git a/mitmproxy/mitmproxy/platform/pf.py b/mitmproxy/platform/pf.py
index 97a4c192..97a4c192 100644
--- a/mitmproxy/mitmproxy/platform/pf.py
+++ b/mitmproxy/platform/pf.py
diff --git a/mitmproxy/mitmproxy/platform/windows.py b/mitmproxy/platform/windows.py
index 9fe04cfa..9fe04cfa 100644
--- a/mitmproxy/mitmproxy/platform/windows.py
+++ b/mitmproxy/platform/windows.py
diff --git a/mitmproxy/mitmproxy/protocol/__init__.py b/mitmproxy/protocol/__init__.py
index d44e25e9..d44e25e9 100644
--- a/mitmproxy/mitmproxy/protocol/__init__.py
+++ b/mitmproxy/protocol/__init__.py
diff --git a/mitmproxy/mitmproxy/protocol/base.py b/mitmproxy/protocol/base.py
index a14066cd..a14066cd 100644
--- a/mitmproxy/mitmproxy/protocol/base.py
+++ b/mitmproxy/protocol/base.py
diff --git a/mitmproxy/mitmproxy/protocol/http.py b/mitmproxy/protocol/http.py
index 13d7903b..13d7903b 100644
--- a/mitmproxy/mitmproxy/protocol/http.py
+++ b/mitmproxy/protocol/http.py
diff --git a/mitmproxy/mitmproxy/protocol/http1.py b/mitmproxy/protocol/http1.py
index a4cd8801..a4cd8801 100644
--- a/mitmproxy/mitmproxy/protocol/http1.py
+++ b/mitmproxy/protocol/http1.py
diff --git a/mitmproxy/mitmproxy/protocol/http2.py b/mitmproxy/protocol/http2.py
index 3fbc500a..3fbc500a 100644
--- a/mitmproxy/mitmproxy/protocol/http2.py
+++ b/mitmproxy/protocol/http2.py
diff --git a/mitmproxy/mitmproxy/protocol/http_replay.py b/mitmproxy/protocol/http_replay.py
index 6316f26c..6316f26c 100644
--- a/mitmproxy/mitmproxy/protocol/http_replay.py
+++ b/mitmproxy/protocol/http_replay.py
diff --git a/mitmproxy/mitmproxy/protocol/rawtcp.py b/mitmproxy/protocol/rawtcp.py
index b87899e4..b87899e4 100644
--- a/mitmproxy/mitmproxy/protocol/rawtcp.py
+++ b/mitmproxy/protocol/rawtcp.py
diff --git a/mitmproxy/mitmproxy/protocol/tls.py b/mitmproxy/protocol/tls.py
index 6913396d..6913396d 100644
--- a/mitmproxy/mitmproxy/protocol/tls.py
+++ b/mitmproxy/protocol/tls.py
diff --git a/mitmproxy/mitmproxy/proxy/__init__.py b/mitmproxy/proxy/__init__.py
index be7f5207..be7f5207 100644
--- a/mitmproxy/mitmproxy/proxy/__init__.py
+++ b/mitmproxy/proxy/__init__.py
diff --git a/mitmproxy/mitmproxy/proxy/config.py b/mitmproxy/proxy/config.py
index a635ab19..a635ab19 100644
--- a/mitmproxy/mitmproxy/proxy/config.py
+++ b/mitmproxy/proxy/config.py
diff --git a/mitmproxy/mitmproxy/proxy/modes/__init__.py b/mitmproxy/proxy/modes/__init__.py
index f014ed98..f014ed98 100644
--- a/mitmproxy/mitmproxy/proxy/modes/__init__.py
+++ b/mitmproxy/proxy/modes/__init__.py
diff --git a/mitmproxy/mitmproxy/proxy/modes/http_proxy.py b/mitmproxy/proxy/modes/http_proxy.py
index e19062b9..e19062b9 100644
--- a/mitmproxy/mitmproxy/proxy/modes/http_proxy.py
+++ b/mitmproxy/proxy/modes/http_proxy.py
diff --git a/mitmproxy/mitmproxy/proxy/modes/reverse_proxy.py b/mitmproxy/proxy/modes/reverse_proxy.py
index c8e80a10..c8e80a10 100644
--- a/mitmproxy/mitmproxy/proxy/modes/reverse_proxy.py
+++ b/mitmproxy/proxy/modes/reverse_proxy.py
diff --git a/mitmproxy/mitmproxy/proxy/modes/socks_proxy.py b/mitmproxy/proxy/modes/socks_proxy.py
index e2ce44ae..e2ce44ae 100644
--- a/mitmproxy/mitmproxy/proxy/modes/socks_proxy.py
+++ b/mitmproxy/proxy/modes/socks_proxy.py
diff --git a/mitmproxy/mitmproxy/proxy/modes/transparent_proxy.py b/mitmproxy/proxy/modes/transparent_proxy.py
index 3fdda656..3fdda656 100644
--- a/mitmproxy/mitmproxy/proxy/modes/transparent_proxy.py
+++ b/mitmproxy/proxy/modes/transparent_proxy.py
diff --git a/mitmproxy/mitmproxy/proxy/root_context.py b/mitmproxy/proxy/root_context.py
index ae49523f..ae49523f 100644
--- a/mitmproxy/mitmproxy/proxy/root_context.py
+++ b/mitmproxy/proxy/root_context.py
diff --git a/mitmproxy/mitmproxy/proxy/server.py b/mitmproxy/proxy/server.py
index 8b62ff93..8b62ff93 100644
--- a/mitmproxy/mitmproxy/proxy/server.py
+++ b/mitmproxy/proxy/server.py
diff --git a/mitmproxy/mitmproxy/script/__init__.py b/mitmproxy/script/__init__.py
index 3ee19b04..3ee19b04 100644
--- a/mitmproxy/mitmproxy/script/__init__.py
+++ b/mitmproxy/script/__init__.py
diff --git a/mitmproxy/mitmproxy/script/concurrent.py b/mitmproxy/script/concurrent.py
index f0f5e3cd..f0f5e3cd 100644
--- a/mitmproxy/mitmproxy/script/concurrent.py
+++ b/mitmproxy/script/concurrent.py
diff --git a/mitmproxy/mitmproxy/script/reloader.py b/mitmproxy/script/reloader.py
index b4acf51b..b4acf51b 100644
--- a/mitmproxy/mitmproxy/script/reloader.py
+++ b/mitmproxy/script/reloader.py
diff --git a/mitmproxy/mitmproxy/script/script.py b/mitmproxy/script/script.py
index 55778851..55778851 100644
--- a/mitmproxy/mitmproxy/script/script.py
+++ b/mitmproxy/script/script.py
diff --git a/mitmproxy/mitmproxy/script/script_context.py b/mitmproxy/script/script_context.py
index cd5d4b61..cd5d4b61 100644
--- a/mitmproxy/mitmproxy/script/script_context.py
+++ b/mitmproxy/script/script_context.py
diff --git a/mitmproxy/mitmproxy/stateobject.py b/mitmproxy/stateobject.py
index a4a1ffda..a4a1ffda 100644
--- a/mitmproxy/mitmproxy/stateobject.py
+++ b/mitmproxy/stateobject.py
diff --git a/mitmproxy/mitmproxy/tnetstring.py b/mitmproxy/tnetstring.py
index c5c185c6..c5c185c6 100644
--- a/mitmproxy/mitmproxy/tnetstring.py
+++ b/mitmproxy/tnetstring.py
diff --git a/mitmproxy/mitmproxy/utils.py b/mitmproxy/utils.py
index 4bdd036e..4bdd036e 100644
--- a/mitmproxy/mitmproxy/utils.py
+++ b/mitmproxy/utils.py
diff --git a/mitmproxy/mitmproxy/version.py b/mitmproxy/version.py
index 63f60a8d..63f60a8d 100644
--- a/mitmproxy/mitmproxy/version.py
+++ b/mitmproxy/version.py
diff --git a/mitmproxy/mitmproxy/web/__init__.py b/mitmproxy/web/__init__.py
index 50c49e8d..50c49e8d 100644
--- a/mitmproxy/mitmproxy/web/__init__.py
+++ b/mitmproxy/web/__init__.py
diff --git a/mitmproxy/mitmproxy/web/app.py b/mitmproxy/web/app.py
index 63b7bf1a..63b7bf1a 100644
--- a/mitmproxy/mitmproxy/web/app.py
+++ b/mitmproxy/web/app.py
diff --git a/mitmproxy/mitmproxy/web/static/app.css b/mitmproxy/web/static/app.css
index 94a6abf0..94a6abf0 100644
--- a/mitmproxy/mitmproxy/web/static/app.css
+++ b/mitmproxy/web/static/app.css
diff --git a/mitmproxy/mitmproxy/web/static/app.js b/mitmproxy/web/static/app.js
index 27f356f7..27f356f7 100644
--- a/mitmproxy/mitmproxy/web/static/app.js
+++ b/mitmproxy/web/static/app.js
diff --git a/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.eot b/mitmproxy/web/static/fonts/fontawesome-webfont.eot
index 84677bc0..84677bc0 100644
--- a/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.eot
+++ b/mitmproxy/web/static/fonts/fontawesome-webfont.eot
diff --git a/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.svg b/mitmproxy/web/static/fonts/fontawesome-webfont.svg
index d907b25a..d907b25a 100644
--- a/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.svg
+++ b/mitmproxy/web/static/fonts/fontawesome-webfont.svg
diff --git a/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.ttf b/mitmproxy/web/static/fonts/fontawesome-webfont.ttf
index 96a3639c..96a3639c 100644
--- a/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.ttf
+++ b/mitmproxy/web/static/fonts/fontawesome-webfont.ttf
diff --git a/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.woff b/mitmproxy/web/static/fonts/fontawesome-webfont.woff
index 628b6a52..628b6a52 100644
--- a/mitmproxy/mitmproxy/web/static/fonts/fontawesome-webfont.woff
+++ b/mitmproxy/web/static/fonts/fontawesome-webfont.woff
diff --git a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/LICENSE b/mitmproxy/web/static/images/chrome-devtools/LICENSE
index 6e4f8b9f..6e4f8b9f 100644
--- a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/LICENSE
+++ b/mitmproxy/web/static/images/chrome-devtools/LICENSE
diff --git a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png b/mitmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png
index 18828d06..18828d06 100644
--- a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png
+++ b/mitmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png b/mitmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png
index fdc10e47..fdc10e47 100644
--- a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png
+++ b/mitmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceJSIcon.png b/mitmproxy/web/static/images/chrome-devtools/resourceJSIcon.png
index c1b72189..c1b72189 100644
--- a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourceJSIcon.png
+++ b/mitmproxy/web/static/images/chrome-devtools/resourceJSIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png b/mitmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png
index 8c82a4c7..8c82a4c7 100644
--- a/mitmproxy/mitmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png
+++ b/mitmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/images/resourceExecutableIcon.png b/mitmproxy/web/static/images/resourceExecutableIcon.png
index fa70c2fd..fa70c2fd 100644
--- a/mitmproxy/mitmproxy/web/static/images/resourceExecutableIcon.png
+++ b/mitmproxy/web/static/images/resourceExecutableIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/images/resourceFlashIcon.png b/mitmproxy/web/static/images/resourceFlashIcon.png
index ead5a4d0..ead5a4d0 100644
--- a/mitmproxy/mitmproxy/web/static/images/resourceFlashIcon.png
+++ b/mitmproxy/web/static/images/resourceFlashIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/images/resourceImageIcon.png b/mitmproxy/web/static/images/resourceImageIcon.png
index 23163042..23163042 100644
--- a/mitmproxy/mitmproxy/web/static/images/resourceImageIcon.png
+++ b/mitmproxy/web/static/images/resourceImageIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/images/resourceJavaIcon.png b/mitmproxy/web/static/images/resourceJavaIcon.png
index 553b3391..553b3391 100644
--- a/mitmproxy/mitmproxy/web/static/images/resourceJavaIcon.png
+++ b/mitmproxy/web/static/images/resourceJavaIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/images/resourceNotModifiedIcon.png b/mitmproxy/web/static/images/resourceNotModifiedIcon.png
index 9c6a879d..9c6a879d 100644
--- a/mitmproxy/mitmproxy/web/static/images/resourceNotModifiedIcon.png
+++ b/mitmproxy/web/static/images/resourceNotModifiedIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/images/resourceRedirectIcon.png b/mitmproxy/web/static/images/resourceRedirectIcon.png
index 58fe3ac1..58fe3ac1 100644
--- a/mitmproxy/mitmproxy/web/static/images/resourceRedirectIcon.png
+++ b/mitmproxy/web/static/images/resourceRedirectIcon.png
diff --git a/mitmproxy/mitmproxy/web/static/vendor.css b/mitmproxy/web/static/vendor.css
index 4ed1f0b8..4ed1f0b8 100644
--- a/mitmproxy/mitmproxy/web/static/vendor.css
+++ b/mitmproxy/web/static/vendor.css
diff --git a/mitmproxy/mitmproxy/web/static/vendor.js b/mitmproxy/web/static/vendor.js
index 59d10445..59d10445 100644
--- a/mitmproxy/mitmproxy/web/static/vendor.js
+++ b/mitmproxy/web/static/vendor.js
diff --git a/mitmproxy/mitmproxy/web/templates/index.html b/mitmproxy/web/templates/index.html
index 5f2c6d5e..5f2c6d5e 100644
--- a/mitmproxy/mitmproxy/web/templates/index.html
+++ b/mitmproxy/web/templates/index.html
diff --git a/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.eot b/mitmproxy/webfonts/fontawesome-webfont.eot
index 84677bc0..84677bc0 100644
--- a/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.eot
+++ b/mitmproxy/webfonts/fontawesome-webfont.eot
diff --git a/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.svg b/mitmproxy/webfonts/fontawesome-webfont.svg
index d907b25a..d907b25a 100644
--- a/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.svg
+++ b/mitmproxy/webfonts/fontawesome-webfont.svg
diff --git a/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.ttf b/mitmproxy/webfonts/fontawesome-webfont.ttf
index 96a3639c..96a3639c 100644
--- a/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.ttf
+++ b/mitmproxy/webfonts/fontawesome-webfont.ttf
diff --git a/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.woff b/mitmproxy/webfonts/fontawesome-webfont.woff
index 628b6a52..628b6a52 100644
--- a/mitmproxy/mitmproxy/webfonts/fontawesome-webfont.woff
+++ b/mitmproxy/webfonts/fontawesome-webfont.woff
diff --git a/netlib/README.rst b/netlib/README.rst
deleted file mode 100644
index 16bd65a7..00000000
--- a/netlib/README.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-|travis| |coveralls| |downloads| |latest_release| |python_versions|
-
-Netlib is a collection of network utility classes, used by the pathod and
-mitmproxy projects. It differs from other projects in some fundamental
-respects, because both pathod and mitmproxy often need to violate standards.
-This means that protocols are implemented as small, well-contained and flexible
-functions, and are designed to allow misbehaviour when needed.
-
-
-Development
------------
-
-If you'd like to work on netlib, check out the instructions in mitmproxy's README_.
-
-.. |travis| image:: https://shields.mitmproxy.org/travis/mitmproxy/netlib/master.svg
-    :target: https://travis-ci.org/mitmproxy/netlib
-    :alt: Build Status
-
-.. |coveralls| image:: https://shields.mitmproxy.org/coveralls/mitmproxy/netlib/master.svg
-    :target: https://coveralls.io/r/mitmproxy/netlib
-    :alt: Coverage Status
-
-.. |downloads| image:: https://shields.mitmproxy.org/pypi/dm/netlib.svg?color=orange
-    :target: https://pypi.python.org/pypi/netlib
-    :alt: Downloads
-
-.. |latest_release| image:: https://shields.mitmproxy.org/pypi/v/netlib.svg
-    :target: https://pypi.python.org/pypi/netlib
-    :alt: Latest Version
-
-.. |python_versions| image:: https://shields.mitmproxy.org/pypi/pyversions/netlib.svg
-    :target: https://pypi.python.org/pypi/netlib
-    :alt: Supported Python versions
-
-.. _README: https://github.com/mitmproxy/mitmproxy#hacking
\ No newline at end of file
diff --git a/netlib/netlib/__init__.py b/netlib/__init__.py
index 9b4faa33..9b4faa33 100644
--- a/netlib/netlib/__init__.py
+++ b/netlib/__init__.py
diff --git a/netlib/netlib/certutils.py b/netlib/certutils.py
index 616a778e..616a778e 100644
--- a/netlib/netlib/certutils.py
+++ b/netlib/certutils.py
diff --git a/netlib/netlib/encoding.py b/netlib/encoding.py
index 14479e00..14479e00 100644
--- a/netlib/netlib/encoding.py
+++ b/netlib/encoding.py
diff --git a/netlib/netlib/exceptions.py b/netlib/exceptions.py
index 05f1054b..05f1054b 100644
--- a/netlib/netlib/exceptions.py
+++ b/netlib/exceptions.py
diff --git a/netlib/netlib/http/__init__.py b/netlib/http/__init__.py
index fd632cd5..fd632cd5 100644
--- a/netlib/netlib/http/__init__.py
+++ b/netlib/http/__init__.py
diff --git a/netlib/netlib/http/authentication.py b/netlib/http/authentication.py
index d769abe5..d769abe5 100644
--- a/netlib/netlib/http/authentication.py
+++ b/netlib/http/authentication.py
diff --git a/netlib/netlib/http/cookies.py b/netlib/http/cookies.py
index 18544b5e..18544b5e 100644
--- a/netlib/netlib/http/cookies.py
+++ b/netlib/http/cookies.py
diff --git a/netlib/netlib/http/headers.py b/netlib/http/headers.py
index 78404796..78404796 100644
--- a/netlib/netlib/http/headers.py
+++ b/netlib/http/headers.py
diff --git a/netlib/netlib/http/http1/__init__.py b/netlib/http/http1/__init__.py
index 2aa7e26a..2aa7e26a 100644
--- a/netlib/netlib/http/http1/__init__.py
+++ b/netlib/http/http1/__init__.py
diff --git a/netlib/netlib/http/http1/assemble.py b/netlib/http/http1/assemble.py
index 785ee8d3..785ee8d3 100644
--- a/netlib/netlib/http/http1/assemble.py
+++ b/netlib/http/http1/assemble.py
diff --git a/netlib/netlib/http/http1/read.py b/netlib/http/http1/read.py
index 6e3a1b93..6e3a1b93 100644
--- a/netlib/netlib/http/http1/read.py
+++ b/netlib/http/http1/read.py
diff --git a/netlib/netlib/http/http2/__init__.py b/netlib/http/http2/__init__.py
index 7043d36f..7043d36f 100644
--- a/netlib/netlib/http/http2/__init__.py
+++ b/netlib/http/http2/__init__.py
diff --git a/netlib/netlib/http/http2/connections.py b/netlib/http/http2/connections.py
index 52fa7193..52fa7193 100644
--- a/netlib/netlib/http/http2/connections.py
+++ b/netlib/http/http2/connections.py
diff --git a/netlib/netlib/http/message.py b/netlib/http/message.py
index e3d8ce37..e3d8ce37 100644
--- a/netlib/netlib/http/message.py
+++ b/netlib/http/message.py
diff --git a/netlib/netlib/http/request.py b/netlib/http/request.py
index b9076c0f..b9076c0f 100644
--- a/netlib/netlib/http/request.py
+++ b/netlib/http/request.py
diff --git a/netlib/netlib/http/response.py b/netlib/http/response.py
index 8f4d6215..8f4d6215 100644
--- a/netlib/netlib/http/response.py
+++ b/netlib/http/response.py
diff --git a/netlib/netlib/http/status_codes.py b/netlib/http/status_codes.py
index 8a4dc1f5..8a4dc1f5 100644
--- a/netlib/netlib/http/status_codes.py
+++ b/netlib/http/status_codes.py
diff --git a/netlib/netlib/http/user_agents.py b/netlib/http/user_agents.py
index e8681908..e8681908 100644
--- a/netlib/netlib/http/user_agents.py
+++ b/netlib/http/user_agents.py
diff --git a/netlib/netlib/odict.py b/netlib/odict.py
index 1e6e381a..1e6e381a 100644
--- a/netlib/netlib/odict.py
+++ b/netlib/odict.py
diff --git a/netlib/setup.cfg b/netlib/setup.cfg
deleted file mode 100644
index 3480374b..00000000
--- a/netlib/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[bdist_wheel]
-universal=1
\ No newline at end of file
diff --git a/netlib/setup.py b/netlib/setup.py
deleted file mode 100644
index 0c9a721d..00000000
--- a/netlib/setup.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from setuptools import setup, find_packages
-from codecs import open
-import os
-import sys
-
-from netlib import version
-
-# Based on https://github.com/pypa/sampleproject/blob/master/setup.py
-# and https://python-packaging-user-guide.readthedocs.org/
-# and https://caremad.io/2014/11/distributing-a-cffi-project/
-
-here = os.path.abspath(os.path.dirname(__file__))
-
-with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
-    long_description = f.read()
-
-setup(
-    name="netlib",
-    version=version.VERSION,
-    description="A collection of network utilities used by pathod and mitmproxy.",
-    long_description=long_description,
-    url="http://github.com/mitmproxy/netlib",
-    author="Aldo Cortesi",
-    author_email="aldo@corte.si",
-    license="MIT",
-    classifiers=[
-        "License :: OSI Approved :: MIT License",
-        "Development Status :: 3 - Alpha",
-        "Operating System :: POSIX",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy",
-        "Topic :: Internet",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
-        "Topic :: Software Development :: Testing",
-        "Topic :: Software Development :: Testing :: Traffic Generation",
-    ],
-    packages=find_packages(),
-    install_requires=[
-        "pyasn1>=0.1.9, <0.2",
-        "pyOpenSSL>=0.15.1, <0.16",
-        "cryptography>=1.2.2, <1.3",
-        "passlib>=1.6.5, <1.7",
-        "hpack>=2.1.0, <3.0",
-        "hyperframe>=3.2.0, <4.0",
-        "six>=1.10.0, <1.11",
-        "certifi>=2015.11.20.1",  # no semver here - this should always be on the last release!
-        "backports.ssl_match_hostname>=3.5.0.1, <3.6",
-    ],
-    extras_require={
-        # Do not use a range operator here: https://bitbucket.org/pypa/setuptools/issues/380
-        # Ubuntu Trusty and other still ship with setuptools < 17.1
-        ':python_version == "2.7"': [
-            "ipaddress>=1.0.15, <1.1",
-        ],
-        'dev': [
-            "mock>=1.3.0, <1.4",
-            "pytest>=2.8.7, <2.9",
-            "pytest-xdist>=1.14, <1.15",
-            "pytest-cov>=2.2.1, <2.3",
-            "pytest-timeout>=1.0.0, <1.1",
-            "coveralls>=1.1, <1.2"
-        ]
-    },
-)
diff --git a/netlib/netlib/socks.py b/netlib/socks.py
index 51ad1c63..51ad1c63 100644
--- a/netlib/netlib/socks.py
+++ b/netlib/socks.py
diff --git a/netlib/netlib/tcp.py b/netlib/tcp.py
index 61b41cdc..61b41cdc 100644
--- a/netlib/netlib/tcp.py
+++ b/netlib/tcp.py
diff --git a/netlib/netlib/tutils.py b/netlib/tutils.py
index f6ce8e0a..f6ce8e0a 100644
--- a/netlib/netlib/tutils.py
+++ b/netlib/tutils.py
diff --git a/netlib/netlib/utils.py b/netlib/utils.py
index f7bb5c4b..f7bb5c4b 100644
--- a/netlib/netlib/utils.py
+++ b/netlib/utils.py
diff --git a/netlib/netlib/version.py b/netlib/version.py
index 379fee0f..379fee0f 100644
--- a/netlib/netlib/version.py
+++ b/netlib/version.py
diff --git a/netlib/netlib/version_check.py b/netlib/version_check.py
index 9cf27eea..9cf27eea 100644
--- a/netlib/netlib/version_check.py
+++ b/netlib/version_check.py
diff --git a/netlib/netlib/websockets/__init__.py b/netlib/websockets/__init__.py
index 1c143919..1c143919 100644
--- a/netlib/netlib/websockets/__init__.py
+++ b/netlib/websockets/__init__.py
diff --git a/netlib/netlib/websockets/frame.py b/netlib/websockets/frame.py
index fce2c9d3..fce2c9d3 100644
--- a/netlib/netlib/websockets/frame.py
+++ b/netlib/websockets/frame.py
diff --git a/netlib/netlib/websockets/protocol.py b/netlib/websockets/protocol.py
index 1e95fa1c..1e95fa1c 100644
--- a/netlib/netlib/websockets/protocol.py
+++ b/netlib/websockets/protocol.py
diff --git a/netlib/netlib/wsgi.py b/netlib/wsgi.py
index d6dfae5d..d6dfae5d 100644
--- a/netlib/netlib/wsgi.py
+++ b/netlib/wsgi.py
diff --git a/pathod/.jsbeautifyrc b/pathod/.jsbeautifyrc
deleted file mode 100644
index 725c15ad..00000000
--- a/pathod/.jsbeautifyrc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "indent_size": 4,
-    "indent_char": " ",
-    "eol": "\n",
-    "indent_level": 0,
-    "indent_with_tabs": false,
-    "preserve_newlines": true,
-    "max_preserve_newlines": 10,
-    "jslint_happy": false,
-    "space_after_anon_function": false,
-    "brace_style": "collapse",
-    "keep_array_indentation": false,
-    "keep_function_indentation": false,
-    "space_before_conditional": true,
-    "break_chained_methods": false,
-    "eval_code": false,
-    "unescape_strings": false,
-    "wrap_line_length": 80,
-    "wrap_attributes": "auto",
-    "wrap_attributes_indent_size": 4,
-    "end_with_newline": true
-}
diff --git a/pathod/README.rst b/pathod/README.rst
deleted file mode 100644
index fbedc5ba..00000000
--- a/pathod/README.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-pathod
-^^^^^^
-
-|travis| |coveralls| |downloads| |latest_release| |python_versions|
-
-**pathod** is a collection of pathological tools for testing and torturing HTTP
-clients and servers. The project has three components:
-
-- ``pathod``, an pathological HTTP daemon.
-- ``pathoc``, a perverse HTTP client.
-- ``pathod.test``, an API for easily using pathod and pathoc in unit tests.
-
-Installing
-----------
-
-If you already have **pip** on your system, installing **pathod** and its
-dependencies is dead simple:
-
-.. code-block:: text
-
-    pip install pathod
-
-Documentation
--------------
-
-The pathod documentation is self-hosted. Just fire up pathod, like so:
-
-.. code-block:: text
-
-    ./pathod
-
-And then browse to:
-
-`<http://localhost:9999>`_
-
-You can always view the documentation for the latest release at the pathod
-website:
-
-`<http://pathod.net>`_
-
-
-.. |travis| image:: https://shields.mitmproxy.org/travis/mitmproxy/pathod/master.svg
-    :target: https://travis-ci.org/mitmproxy/pathod
-    :alt: Build Status
-
-.. |coveralls| image:: https://shields.mitmproxy.org/coveralls/mitmproxy/pathod/master.svg
-    :target: https://coveralls.io/r/mitmproxy/pathod
-    :alt: Coverage Status
-
-.. |downloads| image:: https://shields.mitmproxy.org/pypi/dm/pathod.svg?color=orange
-    :target: https://pypi.python.org/pypi/pathod
-    :alt: Downloads
-
-.. |latest_release| image:: https://shields.mitmproxy.org/pypi/v/pathod.svg
-    :target: https://pypi.python.org/pypi/pathod
-    :alt: Latest Version
-
-.. |python_versions| image:: https://shields.mitmproxy.org/pypi/pyversions/pathod.svg
-    :target: https://pypi.python.org/pypi/pathod
-    :alt: Supported Python versions
\ No newline at end of file
diff --git a/pathod/pathod/__init__.py b/pathod/__init__.py
index e69de29b..e69de29b 100644
--- a/pathod/pathod/__init__.py
+++ b/pathod/__init__.py
diff --git a/pathod/pathod/app.py b/pathod/app.py
index c6b7eabc..c6b7eabc 100644
--- a/pathod/pathod/app.py
+++ b/pathod/app.py
diff --git a/pathod/pathod/language/__init__.py b/pathod/language/__init__.py
index 32199e08..32199e08 100644
--- a/pathod/pathod/language/__init__.py
+++ b/pathod/language/__init__.py
diff --git a/pathod/pathod/language/actions.py b/pathod/language/actions.py
index 34a9bafb..34a9bafb 100644
--- a/pathod/pathod/language/actions.py
+++ b/pathod/language/actions.py
diff --git a/pathod/pathod/language/base.py b/pathod/language/base.py
index a4302998..a4302998 100644
--- a/pathod/pathod/language/base.py
+++ b/pathod/language/base.py
diff --git a/pathod/pathod/language/exceptions.py b/pathod/language/exceptions.py
index 84ad3c02..84ad3c02 100644
--- a/pathod/pathod/language/exceptions.py
+++ b/pathod/language/exceptions.py
diff --git a/pathod/pathod/language/generators.py b/pathod/language/generators.py
index a17e7052..a17e7052 100644
--- a/pathod/pathod/language/generators.py
+++ b/pathod/language/generators.py
diff --git a/pathod/pathod/language/http.py b/pathod/language/http.py
index a82f12fe..a82f12fe 100644
--- a/pathod/pathod/language/http.py
+++ b/pathod/language/http.py
diff --git a/pathod/pathod/language/http2.py b/pathod/language/http2.py
index d5e3ca31..d5e3ca31 100644
--- a/pathod/pathod/language/http2.py
+++ b/pathod/language/http2.py
diff --git a/pathod/pathod/language/message.py b/pathod/language/message.py
index 33124856..33124856 100644
--- a/pathod/pathod/language/message.py
+++ b/pathod/language/message.py
diff --git a/pathod/pathod/language/websockets.py b/pathod/language/websockets.py
index ea7c870e..ea7c870e 100644
--- a/pathod/pathod/language/websockets.py
+++ b/pathod/language/websockets.py
diff --git a/pathod/pathod/language/writer.py b/pathod/language/writer.py
index 1a27e1ef..1a27e1ef 100644
--- a/pathod/pathod/language/writer.py
+++ b/pathod/language/writer.py
diff --git a/pathod/pathod/log.py b/pathod/log.py
index f203542f..f203542f 100644
--- a/pathod/pathod/log.py
+++ b/pathod/log.py
diff --git a/pathod/pathod/pathoc.py b/pathod/pathoc.py
index c0a33b62..c0a33b62 100644
--- a/pathod/pathod/pathoc.py
+++ b/pathod/pathoc.py
diff --git a/pathod/pathod/pathoc_cmdline.py b/pathod/pathoc_cmdline.py
index bf827a9a..bf827a9a 100644
--- a/pathod/pathod/pathoc_cmdline.py
+++ b/pathod/pathoc_cmdline.py
diff --git a/pathod/pathod/pathod.py b/pathod/pathod.py
index 55e75074..55e75074 100644
--- a/pathod/pathod/pathod.py
+++ b/pathod/pathod.py
diff --git a/pathod/pathod/pathod_cmdline.py b/pathod/pathod_cmdline.py
index c9272249..c9272249 100644
--- a/pathod/pathod/pathod_cmdline.py
+++ b/pathod/pathod_cmdline.py
diff --git a/pathod/pathod/protocols/__init__.py b/pathod/protocols/__init__.py
index 1a8c7dab..1a8c7dab 100644
--- a/pathod/pathod/protocols/__init__.py
+++ b/pathod/protocols/__init__.py
diff --git a/pathod/pathod/protocols/http.py b/pathod/protocols/http.py
index 1f1765cb..1f1765cb 100644
--- a/pathod/pathod/protocols/http.py
+++ b/pathod/protocols/http.py
diff --git a/pathod/pathod/protocols/http2.py b/pathod/protocols/http2.py
index a098a14e..a098a14e 100644
--- a/pathod/pathod/protocols/http2.py
+++ b/pathod/protocols/http2.py
diff --git a/pathod/pathod/protocols/websockets.py b/pathod/protocols/websockets.py
index 134d27bc..134d27bc 100644
--- a/pathod/pathod/protocols/websockets.py
+++ b/pathod/protocols/websockets.py
diff --git a/pathod/setup.py b/pathod/setup.py
deleted file mode 100644
index 23e26f42..00000000
--- a/pathod/setup.py
+++ /dev/null
@@ -1,65 +0,0 @@
-from setuptools import setup, find_packages
-from codecs import open
-import os
-import sys
-
-# Based on https://github.com/pypa/sampleproject/blob/master/setup.py
-# and https://python-packaging-user-guide.readthedocs.org/
-
-here = os.path.abspath(os.path.dirname(__file__))
-
-sys.path.append(os.path.join(here, "..", "netlib"))
-from pathod import version
-
-with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
-    long_description = f.read()
-
-setup(
-    name="pathod",
-    version=version.VERSION,
-    description="A pathological HTTP/S daemon for testing and stressing clients.",
-    long_description=long_description,
-    url="http://pathod.net",
-    author="Aldo Cortesi",
-    author_email="aldo@corte.si",
-    license="MIT",
-    classifiers=[
-        "License :: OSI Approved :: MIT License",
-        "Development Status :: 5 - Production/Stable",
-        "Operating System :: POSIX",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy",
-        "Topic :: Internet",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
-        "Topic :: Software Development :: Testing",
-        "Topic :: Software Development :: Testing :: Traffic Generation",
-    ],
-    packages=find_packages(),
-    include_package_data=True,
-    entry_points={
-        'console_scripts': [
-            "pathod = pathod.pathod_cmdline:go_pathod",
-            "pathoc = pathod.pathoc_cmdline:go_pathoc"
-        ]
-    },
-    install_requires=[
-        "netlib=={}".format(version.VERSION),
-        "requests>=2.9.1, <2.10",
-        "Flask>=0.10.1, <0.11",
-        "pyparsing>=2.1,<2.2"
-    ],
-    extras_require={
-        'dev': [
-            "mock>=1.3.0, <1.4",
-            "pytest>=2.8.0",
-            "pytest-xdist>=1.14, <1.15",
-            "pytest-cov>=2.2.1, <2.3",
-            "pytest-timeout>=1.0.0, <1.1",
-            "coveralls>=1.1, <1.2"
-        ]
-    }
-)
diff --git a/pathod/pathod/static/bootstrap.min.css b/pathod/static/bootstrap.min.css
index 2e79d91a..2e79d91a 100644
--- a/pathod/pathod/static/bootstrap.min.css
+++ b/pathod/static/bootstrap.min.css
diff --git a/pathod/pathod/static/bootstrap.min.js b/pathod/static/bootstrap.min.js
index 14356981..14356981 100644
--- a/pathod/pathod/static/bootstrap.min.js
+++ b/pathod/static/bootstrap.min.js
diff --git a/pathod/pathod/static/jquery-1.7.2.min.js b/pathod/static/jquery-1.7.2.min.js
index 16ad06c5..16ad06c5 100644
--- a/pathod/pathod/static/jquery-1.7.2.min.js
+++ b/pathod/static/jquery-1.7.2.min.js
diff --git a/pathod/pathod/static/jquery.localscroll-min.js b/pathod/static/jquery.localscroll-min.js
index 3f8d64cc..fa583a45 100644
--- a/pathod/pathod/static/jquery.localscroll-min.js
+++ b/pathod/static/jquery.localscroll-min.js
@@ -1,9 +1,9 @@
-/**

- * jQuery.LocalScroll - Animated scrolling navigation, using anchors.

- * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com

- * Dual licensed under MIT and GPL.

- * Date: 3/11/2009

- * @author Ariel Flesler

- * @version 1.2.7

- **/

+/**
+ * jQuery.LocalScroll - Animated scrolling navigation, using anchors.
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 3/11/2009
+ * @author Ariel Flesler
+ * @version 1.2.7
+ **/
 ;(function($){var l=location.href.replace(/#.*/,'');var g=$.localScroll=function(a){$('body').localScroll(a)};g.defaults={duration:1e3,axis:'y',event:'click',stop:true,target:window,reset:true};g.hash=function(a){if(location.hash){a=$.extend({},g.defaults,a);a.hash=false;if(a.reset){var e=a.duration;delete a.duration;$(a.target).scrollTo(0,a);a.duration=e}i(0,location,a)}};$.fn.localScroll=function(b){b=$.extend({},g.defaults,b);return b.lazy?this.bind(b.event,function(a){var e=$([a.target,a.target.parentNode]).filter(d)[0];if(e)i(a,e,b)}):this.find('a,area').filter(d).bind(b.event,function(a){i(a,this,b)}).end().end();function d(){return!!this.href&&!!this.hash&&this.href.replace(this.hash,'')==l&&(!b.filter||$(this).is(b.filter))}};function i(a,e,b){var d=e.hash.slice(1),f=document.getElementById(d)||document.getElementsByName(d)[0];if(!f)return;if(a)a.preventDefault();var h=$(b.target);if(b.lock&&h.is(':animated')||b.onBefore&&b.onBefore.call(b,a,f,h)===false)return;if(b.stop)h.stop(true);if(b.hash){var j=f.id==d?'id':'name',k=$('<a> </a>').attr(j,d).css({position:'absolute',top:$(window).scrollTop(),left:$(window).scrollLeft()});f[j]='';$('body').prepend(k);location=e.hash;k.remove();f[j]=d}h.scrollTo(f,b).trigger('notify.serialScroll',[f])}})(jQuery);
\ No newline at end of file
diff --git a/pathod/pathod/static/jquery.scrollTo-min.js b/pathod/static/jquery.scrollTo-min.js
index 7d4001dc..8503c892 100644
--- a/pathod/pathod/static/jquery.scrollTo-min.js
+++ b/pathod/static/jquery.scrollTo-min.js
@@ -1,11 +1,11 @@
-/**

- * jQuery.ScrollTo - Easy element scrolling using jQuery.

- * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com

- * Dual licensed under MIT and GPL.

- * Date: 3/9/2009

- * @author Ariel Flesler

- * @version 1.4.1

- *

- * http://flesler.blogspot.com/2007/10/jqueryscrollto.html

- */

+/**
+ * jQuery.ScrollTo - Easy element scrolling using jQuery.
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 3/9/2009
+ * @author Ariel Flesler
+ * @version 1.4.1
+ *
+ * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
+ */
 ;(function($){var m=$.scrollTo=function(b,h,f){$(window).scrollTo(b,h,f)};m.defaults={axis:'xy',duration:parseFloat($.fn.jquery)>=1.3?0:1};m.window=function(b){return $(window).scrollable()};$.fn.scrollable=function(){return this.map(function(){var b=this,h=!b.nodeName||$.inArray(b.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!h)return b;var f=(b.contentWindow||b).document||b.ownerDocument||b;return $.browser.safari||f.compatMode=='BackCompat'?f.body:f.documentElement})};$.fn.scrollTo=function(l,j,a){if(typeof j=='object'){a=j;j=0}if(typeof a=='function')a={onAfter:a};if(l=='max')l=9e9;a=$.extend({},m.defaults,a);j=j||a.speed||a.duration;a.queue=a.queue&&a.axis.length>1;if(a.queue)j/=2;a.offset=n(a.offset);a.over=n(a.over);return this.scrollable().each(function(){var k=this,o=$(k),d=l,p,g={},q=o.is('html,body');switch(typeof d){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px)?$/.test(d)){d=n(d);break}d=$(d,this);case'object':if(d.is||d.style)p=(d=$(d)).offset()}$.each(a.axis.split(''),function(b,h){var f=h=='x'?'Left':'Top',i=f.toLowerCase(),c='scroll'+f,r=k[c],s=h=='x'?'Width':'Height';if(p){g[c]=p[i]+(q?0:r-o.offset()[i]);if(a.margin){g[c]-=parseInt(d.css('margin'+f))||0;g[c]-=parseInt(d.css('border'+f+'Width'))||0}g[c]+=a.offset[i]||0;if(a.over[i])g[c]+=d[s.toLowerCase()]()*a.over[i]}else g[c]=d[i];if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],u(s));if(!b&&a.queue){if(r!=g[c])t(a.onAfterFirst);delete g[c]}});t(a.onAfter);function t(b){o.animate(g,j,a.easing,b&&function(){b.call(this,l,a)})};function u(b){var h='scroll'+b;if(!q)return k[h];var f='client'+b,i=k.ownerDocument.documentElement,c=k.ownerDocument.body;return Math.max(i[h],c[h])-Math.min(i[f],c[f])}}).end()};function n(b){return typeof b=='object'?b:{top:b,left:b}}})(jQuery);
\ No newline at end of file
diff --git a/pathod/pathod/static/pathod.css b/pathod/static/pathod.css
index 8b23b4d5..8b23b4d5 100644
--- a/pathod/pathod/static/pathod.css
+++ b/pathod/static/pathod.css
diff --git a/pathod/pathod/static/start_quote.png b/pathod/static/start_quote.png
index 8090f6e8..8090f6e8 100644
--- a/pathod/pathod/static/start_quote.png
+++ b/pathod/static/start_quote.png
diff --git a/pathod/pathod/static/syntax.css b/pathod/static/syntax.css
index e371658a..e371658a 100644
--- a/pathod/pathod/static/syntax.css
+++ b/pathod/static/syntax.css
diff --git a/pathod/pathod/static/torture.png b/pathod/static/torture.png
index 50e245ea..50e245ea 100644
--- a/pathod/pathod/static/torture.png
+++ b/pathod/static/torture.png
diff --git a/pathod/pathod/templates/about.html b/pathod/templates/about.html
index 340dc386..340dc386 100644
--- a/pathod/pathod/templates/about.html
+++ b/pathod/templates/about.html
diff --git a/pathod/pathod/templates/docframe.html b/pathod/templates/docframe.html
index 797de20a..797de20a 100644
--- a/pathod/pathod/templates/docframe.html
+++ b/pathod/templates/docframe.html
diff --git a/pathod/pathod/templates/docs_lang.html b/pathod/templates/docs_lang.html
index a1d22aef..a1d22aef 100644
--- a/pathod/pathod/templates/docs_lang.html
+++ b/pathod/templates/docs_lang.html
diff --git a/pathod/pathod/templates/docs_lang_requests.html b/pathod/templates/docs_lang_requests.html
index 81aff535..81aff535 100644
--- a/pathod/pathod/templates/docs_lang_requests.html
+++ b/pathod/templates/docs_lang_requests.html
diff --git a/pathod/pathod/templates/docs_lang_responses.html b/pathod/templates/docs_lang_responses.html
index 9a85ff1a..9a85ff1a 100644
--- a/pathod/pathod/templates/docs_lang_responses.html
+++ b/pathod/templates/docs_lang_responses.html
diff --git a/pathod/pathod/templates/docs_lang_websockets.html b/pathod/templates/docs_lang_websockets.html
index dd318e0b..dd318e0b 100644
--- a/pathod/pathod/templates/docs_lang_websockets.html
+++ b/pathod/templates/docs_lang_websockets.html
diff --git a/pathod/pathod/templates/docs_libpathod.html b/pathod/templates/docs_libpathod.html
index 8eb6846a..8eb6846a 100644
--- a/pathod/pathod/templates/docs_libpathod.html
+++ b/pathod/templates/docs_libpathod.html
diff --git a/pathod/pathod/templates/docs_pathoc.html b/pathod/templates/docs_pathoc.html
index d38c3a77..d38c3a77 100644
--- a/pathod/pathod/templates/docs_pathoc.html
+++ b/pathod/templates/docs_pathoc.html
diff --git a/pathod/pathod/templates/docs_pathod.html b/pathod/templates/docs_pathod.html
index 0d0ae933..0d0ae933 100644
--- a/pathod/pathod/templates/docs_pathod.html
+++ b/pathod/templates/docs_pathod.html
diff --git a/pathod/pathod/templates/docs_test.html b/pathod/templates/docs_test.html
index ecd84bc7..ecd84bc7 100644
--- a/pathod/pathod/templates/docs_test.html
+++ b/pathod/templates/docs_test.html
diff --git a/pathod/pathod/templates/download.html b/pathod/templates/download.html
index bd8950e8..bd8950e8 100644
--- a/pathod/pathod/templates/download.html
+++ b/pathod/templates/download.html
diff --git a/pathod/pathod/templates/examples_context.html b/pathod/templates/examples_context.html
index 20b02c39..20b02c39 100644
--- a/pathod/pathod/templates/examples_context.html
+++ b/pathod/templates/examples_context.html
diff --git a/pathod/pathod/templates/examples_setup.html b/pathod/templates/examples_setup.html
index b8419171..b8419171 100644
--- a/pathod/pathod/templates/examples_setup.html
+++ b/pathod/templates/examples_setup.html
diff --git a/pathod/pathod/templates/examples_setupall.html b/pathod/templates/examples_setupall.html
index 3308f6cb..3308f6cb 100644
--- a/pathod/pathod/templates/examples_setupall.html
+++ b/pathod/templates/examples_setupall.html
diff --git a/pathod/pathod/templates/frame.html b/pathod/templates/frame.html
index 4223458d..4223458d 100644
--- a/pathod/pathod/templates/frame.html
+++ b/pathod/templates/frame.html
diff --git a/pathod/pathod/templates/index.html b/pathod/templates/index.html
index a85a4040..a85a4040 100644
--- a/pathod/pathod/templates/index.html
+++ b/pathod/templates/index.html
diff --git a/pathod/pathod/templates/layout.html b/pathod/templates/layout.html
index af2857b1..af2857b1 100644
--- a/pathod/pathod/templates/layout.html
+++ b/pathod/templates/layout.html
diff --git a/pathod/pathod/templates/log.html b/pathod/templates/log.html
index b0484cb8..b0484cb8 100644
--- a/pathod/pathod/templates/log.html
+++ b/pathod/templates/log.html
diff --git a/pathod/pathod/templates/onelog.html b/pathod/templates/onelog.html
index c222ad60..c222ad60 100644
--- a/pathod/pathod/templates/onelog.html
+++ b/pathod/templates/onelog.html
diff --git a/pathod/pathod/templates/request_preview.html b/pathod/templates/request_preview.html
index 25d73679..25d73679 100644
--- a/pathod/pathod/templates/request_preview.html
+++ b/pathod/templates/request_preview.html
diff --git a/pathod/pathod/templates/request_previewform.html b/pathod/templates/request_previewform.html
index 91b5598a..91b5598a 100644
--- a/pathod/pathod/templates/request_previewform.html
+++ b/pathod/templates/request_previewform.html
diff --git a/pathod/pathod/templates/response_preview.html b/pathod/templates/response_preview.html
index bbce6d6c..bbce6d6c 100644
--- a/pathod/pathod/templates/response_preview.html
+++ b/pathod/templates/response_preview.html
diff --git a/pathod/pathod/templates/response_previewform.html b/pathod/templates/response_previewform.html
index d46043f3..d46043f3 100644
--- a/pathod/pathod/templates/response_previewform.html
+++ b/pathod/templates/response_previewform.html
diff --git a/pathod/pathod/test.py b/pathod/test.py
index 33a6b763..33a6b763 100644
--- a/pathod/pathod/test.py
+++ b/pathod/test.py
diff --git a/pathod/pathod/utils.py b/pathod/utils.py
index a1109a3c..a1109a3c 100644
--- a/pathod/pathod/utils.py
+++ b/pathod/utils.py
diff --git a/pathod/pathod/version.py b/pathod/version.py
index 63f60a8d..63f60a8d 100644
--- a/pathod/pathod/version.py
+++ b/pathod/version.py
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 6efbdeae..00000000
--- a/pytest.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[pytest]
-testpaths = test
-addopts = --timeout 30 -s
diff --git a/requirements.txt b/requirements.txt
index e8b49f2f..9d5d5bbb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,2 @@
--e ./netlib[dev]
--e ./pathod[dev]
--e ./mitmproxy[dev,examples,contentviews]
+-e .[dev,examples,contentviews]
 -e ./release
\ No newline at end of file
diff --git a/mitmproxy/setup.cfg b/setup.cfg
index 1151288f..2155af3c 100644
--- a/mitmproxy/setup.cfg
+++ b/setup.cfg
@@ -9,3 +9,4 @@ ignore = E251
 
 [pytest]
 testpaths = test
+addopts = --timeout 30 -s
\ No newline at end of file
diff --git a/mitmproxy/setup.py b/setup.py
index 5f8c6d42..d7c86e3c 100644
--- a/mitmproxy/setup.py
+++ b/setup.py
@@ -8,7 +8,6 @@ import sys
 
 here = os.path.abspath(os.path.dirname(__file__))
 
-sys.path.append(os.path.join(here, "..", "netlib"))
 from mitmproxy import version
 
 with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
@@ -30,6 +29,7 @@ setup(
         "Environment :: Console :: Curses",
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: POSIX",
+        "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
@@ -41,37 +41,52 @@ setup(
         "Topic :: Internet :: Proxy Servers",
         "Topic :: Software Development :: Testing"
     ],
-    packages=find_packages(),
+    packages=find_packages(include=[
+        "mitmproxy", "mitmproxy.*",
+        "pathod", "pathod.*",
+        "netlib", "netlib.*"
+    ]),
     include_package_data=True,
     entry_points={
         'console_scripts': [
-            'mitmproxy = mitmproxy.main:mitmproxy',
-            'mitmdump = mitmproxy.main:mitmdump',
-            'mitmweb = mitmproxy.main:mitmweb'
+            "mitmproxy = mitmproxy.main:mitmproxy",
+            "mitmdump = mitmproxy.main:mitmdump",
+            "mitmweb = mitmproxy.main:mitmweb",
+            "pathod = pathod.pathod_cmdline:go_pathod",
+            "pathoc = pathod.pathoc_cmdline:go_pathoc"
         ]
     },
     # https://packaging.python.org/en/latest/requirements/#install-requires
     # It is not considered best practice to use install_requires to pin dependencies to specific versions.
     install_requires=[
-        "netlib=={}".format(version.VERSION),
-        "h2>=2.1.2, <3.0",
-        "tornado>=4.3, <4.4",
-        "configargparse>=0.10, <0.11",
-        "pyperclip>=1.5.22, <1.6",
+        "backports.ssl_match_hostname>=3.5.0.1, <3.6",
         "blinker>=1.4, <1.5",
-        "pyparsing>=2.1,<2.2",
-        "html2text==2016.1.8",
+        "click>=6.2, <7.0",
+        "certifi>=2015.11.20.1",  # no semver here - this should always be on the last release!
+        "configargparse>=0.10, <0.11",
         "construct>=2.5.2, <2.6",
-        "six>=1.10, <1.11",
+        "cryptography>=1.2.2, <1.3",
+        "Flask>=0.10.1, <0.11",
+        "h2>=2.1.2, <3.0",
+        "hpack>=2.1.0, <3.0",
+        "html2text==2016.1.8",
+        "hyperframe>=3.2.0, <4.0",
         "Pillow>=3.1, <3.2",
-        "watchdog>=0.8.3, <0.9",
-        "click>=6.2, <7.0",
+        "passlib>=1.6.5, <1.7",
+        "pyasn1>=0.1.9, <0.2",
+        "pyOpenSSL>=0.15.1, <0.16",
+        "pyparsing>=2.1,<2.2",
+        "pyperclip>=1.5.22, <1.6",
+        "requests>=2.9.1, <2.10",
+        "six>=1.10, <1.11",
+        "tornado>=4.3, <4.4",
         "urwid>=1.3.1, <1.4",
+        "watchdog>=0.8.3, <0.9",
     ],
     extras_require={
         ':sys_platform == "win32"': [
-            "pydivert>=0.0.7, <0.1",
             "lxml==3.4.4",  # there are no Windows wheels for newer versions, so we pin this.
+            "pydivert>=0.0.7, <0.1",
         ],
         ':sys_platform != "win32"': [
             "lxml>=3.5.0, <3.6",
@@ -80,28 +95,28 @@ setup(
         # Ubuntu Trusty and other still ship with setuptools < 17.1
         ':python_version == "2.7"': [
             "enum34>=1.0.4, <2",
+            "ipaddress>=1.0.15, <1.1",
         ],
         'dev': [
+            "coveralls>=1.1, <1.2",
             "mock>=1.3.0, <1.4",
             "pytest>=2.8.7, <2.9",
-            "pytest-xdist>=1.14, <1.15",
             "pytest-cov>=2.2.1, <2.3",
             "pytest-timeout>=1.0.0, <1.1",
-            "coveralls>=1.1, <1.2",
-            "pathod=={}".format(version.VERSION),
+            "pytest-xdist>=1.14, <1.15",
             "sphinx>=1.3.5, <1.4",
             "sphinx-autobuild>=0.5.2, <0.7",
-            "sphinxcontrib-documentedlist>=0.3.0, <0.4"
+            "sphinxcontrib-documentedlist>=0.3.0, <0.4",
         ],
         'contentviews': [
-            "pyamf>=0.8.0, <0.9",
+            "cssutils>=1.0.1, <1.1",
             "protobuf>=2.6.1, <2.7",
-            "cssutils>=1.0.1, <1.1"
+            "pyamf>=0.8.0, <0.9",
         ],
         'examples': [
-            "pytz==2015.7.0",
-            "harparser>=0.2, <0.3",
             "beautifulsoup4>=4.4.1, <4.5",
+            "harparser>=0.2, <0.3",
+            "pytz==2015.7.0",
         ]
     }
 )