move mitmproxy

444 files changed, 0 insertions, 0 deletions

diff --git a/.appveyor.yml b/mitmproxy/.appveyor.yml
index 64a5c882..64a5c882 100644
--- a/.appveyor.yml
+++ b/mitmproxy/.appveyor.yml
diff --git a/.coveragerc b/mitmproxy/.coveragerc
index 7b2c1682..7b2c1682 100644
--- a/.coveragerc
+++ b/mitmproxy/.coveragerc
diff --git a/.dockerignore b/mitmproxy/.dockerignore
index 6b8710a7..6b8710a7 100644
--- a/.dockerignore
+++ b/mitmproxy/.dockerignore
diff --git a/.env b/mitmproxy/.env
index 69ac3f05..69ac3f05 100644
--- a/.env
+++ b/mitmproxy/.env
diff --git a/.gitattributes b/mitmproxy/.gitattributes
index 8984c4bd..8984c4bd 100644
--- a/.gitattributes
+++ b/mitmproxy/.gitattributes
diff --git a/.gitignore b/mitmproxy/.gitignore
index fc63a7ca..fc63a7ca 100644
--- a/.gitignore
+++ b/mitmproxy/.gitignore
diff --git a/.landscape.yml b/mitmproxy/.landscape.yml
index 9dfa62b0..9dfa62b0 100644
--- a/.landscape.yml
+++ b/mitmproxy/.landscape.yml
diff --git a/.travis.yml b/mitmproxy/.travis.yml
index f32a58c1..f32a58c1 100644
--- a/.travis.yml
+++ b/mitmproxy/.travis.yml
diff --git a/CHANGELOG b/mitmproxy/CHANGELOG
index c4cd0da9..c4cd0da9 100644
--- a/CHANGELOG
+++ b/mitmproxy/CHANGELOG
diff --git a/CONTRIBUTING.md b/mitmproxy/CONTRIBUTING.md
index ae948d73..ae948d73 100644
--- a/CONTRIBUTING.md
+++ b/mitmproxy/CONTRIBUTING.md
diff --git a/CONTRIBUTORS b/mitmproxy/CONTRIBUTORS
index 9755041b..9755041b 100644
--- a/CONTRIBUTORS
+++ b/mitmproxy/CONTRIBUTORS
diff --git a/Dockerfile b/mitmproxy/Dockerfile
index a689ed5e..a689ed5e 100644
--- a/Dockerfile
+++ b/mitmproxy/Dockerfile
diff --git a/LICENSE b/mitmproxy/LICENSE
index c08a0186..c08a0186 100644
--- a/LICENSE
+++ b/mitmproxy/LICENSE
diff --git a/MANIFEST.in b/mitmproxy/MANIFEST.in
index bd612fd2..bd612fd2 100644
--- a/MANIFEST.in
+++ b/mitmproxy/MANIFEST.in
diff --git a/README.rst b/mitmproxy/README.rst
index e8b3c84a..e8b3c84a 100644
--- a/README.rst
+++ b/mitmproxy/README.rst
diff --git a/dev b/mitmproxy/dev
index fe1a619b..fe1a619b 100755..100644
--- a/dev
+++ b/mitmproxy/dev
diff --git a/dev.bat b/mitmproxy/dev.bat
index 68b584b7..68b584b7 100644
--- a/dev.bat
+++ b/mitmproxy/dev.bat
diff --git a/docs/.gitignore b/mitmproxy/docs/.gitignore
index 69fa449d..69fa449d 100644
--- a/docs/.gitignore
+++ b/mitmproxy/docs/.gitignore
diff --git a/docs/Makefile b/mitmproxy/docs/Makefile
index 99264d90..99264d90 100644
--- a/docs/Makefile
+++ b/mitmproxy/docs/Makefile
diff --git a/docs/_templates/page.html b/mitmproxy/docs/_templates/page.html
index 8002396a..8002396a 100644
--- a/docs/_templates/page.html
+++ b/mitmproxy/docs/_templates/page.html
diff --git a/docs/certinstall-webapp.png b/mitmproxy/docs/certinstall-webapp.png
index 10e795cd..10e795cd 100644
--- a/docs/certinstall-webapp.png
+++ b/mitmproxy/docs/certinstall-webapp.png
diff --git a/docs/certinstall.rst b/mitmproxy/docs/certinstall.rst
index 5a8cce64..5a8cce64 100644
--- a/docs/certinstall.rst
+++ b/mitmproxy/docs/certinstall.rst
diff --git a/docs/conf.py b/mitmproxy/docs/conf.py
index 3ea38e48..3ea38e48 100644
--- a/docs/conf.py
+++ b/mitmproxy/docs/conf.py
diff --git a/docs/config.rst b/mitmproxy/docs/config.rst
index 634b8703..634b8703 100644
--- a/docs/config.rst
+++ b/mitmproxy/docs/config.rst
diff --git a/docs/custom-routing.txt b/mitmproxy/docs/custom-routing.txt
index 2ba2281f..2ba2281f 100644
--- a/docs/custom-routing.txt
+++ b/mitmproxy/docs/custom-routing.txt
diff --git a/docs/dev/addingviews.html b/mitmproxy/docs/dev/addingviews.html
index 12623a31..12623a31 100644
--- a/docs/dev/addingviews.html
+++ b/mitmproxy/docs/dev/addingviews.html
diff --git a/docs/dev/architecture.rst b/mitmproxy/docs/dev/architecture.rst
index e7995141..e7995141 100644
--- a/docs/dev/architecture.rst
+++ b/mitmproxy/docs/dev/architecture.rst
diff --git a/docs/dev/exceptions.rst b/mitmproxy/docs/dev/exceptions.rst
index dab10e74..dab10e74 100644
--- a/docs/dev/exceptions.rst
+++ b/mitmproxy/docs/dev/exceptions.rst
diff --git a/docs/dev/models.rst b/mitmproxy/docs/dev/models.rst
index b09c8bae..b09c8bae 100644
--- a/docs/dev/models.rst
+++ b/mitmproxy/docs/dev/models.rst
diff --git a/docs/dev/protocols.rst b/mitmproxy/docs/dev/protocols.rst
index 1f8cca9a..1f8cca9a 100644
--- a/docs/dev/protocols.rst
+++ b/mitmproxy/docs/dev/protocols.rst
diff --git a/docs/dev/proxy.rst b/mitmproxy/docs/dev/proxy.rst
index dbd6fe67..dbd6fe67 100644
--- a/docs/dev/proxy.rst
+++ b/mitmproxy/docs/dev/proxy.rst
diff --git a/docs/dev/sslkeylogfile.rst b/mitmproxy/docs/dev/sslkeylogfile.rst
index 04b86cc4..04b86cc4 100644
--- a/docs/dev/sslkeylogfile.rst
+++ b/mitmproxy/docs/dev/sslkeylogfile.rst
diff --git a/docs/dev/testing.rst b/mitmproxy/docs/dev/testing.rst
index d7554954..d7554954 100644
--- a/docs/dev/testing.rst
+++ b/mitmproxy/docs/dev/testing.rst
diff --git a/docs/favicon.ico b/mitmproxy/docs/favicon.ico
index 3c3b891c..3c3b891c 100644
--- a/docs/favicon.ico
+++ b/mitmproxy/docs/favicon.ico
diff --git a/docs/features/anticache.rst b/mitmproxy/docs/features/anticache.rst
index 65d22bab..65d22bab 100644
--- a/docs/features/anticache.rst
+++ b/mitmproxy/docs/features/anticache.rst
diff --git a/docs/features/clientreplay.rst b/mitmproxy/docs/features/clientreplay.rst
index b0eb6792..b0eb6792 100644
--- a/docs/features/clientreplay.rst
+++ b/mitmproxy/docs/features/clientreplay.rst
diff --git a/docs/features/filters.rst b/mitmproxy/docs/features/filters.rst
index 2adcfb70..2adcfb70 100644
--- a/docs/features/filters.rst
+++ b/mitmproxy/docs/features/filters.rst
diff --git a/docs/features/passthrough.rst b/mitmproxy/docs/features/passthrough.rst
index b7b5df84..b7b5df84 100644
--- a/docs/features/passthrough.rst
+++ b/mitmproxy/docs/features/passthrough.rst
diff --git a/docs/features/proxyauth.rst b/mitmproxy/docs/features/proxyauth.rst
index bfd32fbd..bfd32fbd 100644
--- a/docs/features/proxyauth.rst
+++ b/mitmproxy/docs/features/proxyauth.rst
diff --git a/docs/features/replacements.rst b/mitmproxy/docs/features/replacements.rst
index 8f760866..8f760866 100644
--- a/docs/features/replacements.rst
+++ b/mitmproxy/docs/features/replacements.rst
diff --git a/docs/features/responsestreaming.rst b/mitmproxy/docs/features/responsestreaming.rst
index 8975c1f8..8975c1f8 100644
--- a/docs/features/responsestreaming.rst
+++ b/mitmproxy/docs/features/responsestreaming.rst
diff --git a/docs/features/reverseproxy.rst b/mitmproxy/docs/features/reverseproxy.rst
index 87065e73..87065e73 100644
--- a/docs/features/reverseproxy.rst
+++ b/mitmproxy/docs/features/reverseproxy.rst
diff --git a/docs/features/serverreplay.rst b/mitmproxy/docs/features/serverreplay.rst
index 261a1bd6..261a1bd6 100644
--- a/docs/features/serverreplay.rst
+++ b/mitmproxy/docs/features/serverreplay.rst
diff --git a/docs/features/setheaders.rst b/mitmproxy/docs/features/setheaders.rst
index cbc8b6a5..cbc8b6a5 100644
--- a/docs/features/setheaders.rst
+++ b/mitmproxy/docs/features/setheaders.rst
diff --git a/docs/features/socksproxy.rst b/mitmproxy/docs/features/socksproxy.rst
index 76d4cda9..76d4cda9 100644
--- a/docs/features/socksproxy.rst
+++ b/mitmproxy/docs/features/socksproxy.rst
diff --git a/docs/features/sticky.rst b/mitmproxy/docs/features/sticky.rst
index a79cbe8d..a79cbe8d 100644
--- a/docs/features/sticky.rst
+++ b/mitmproxy/docs/features/sticky.rst
diff --git a/docs/features/tcpproxy.rst b/mitmproxy/docs/features/tcpproxy.rst
index fd0746a2..fd0746a2 100644
--- a/docs/features/tcpproxy.rst
+++ b/mitmproxy/docs/features/tcpproxy.rst
diff --git a/docs/features/upstreamcerts.rst b/mitmproxy/docs/features/upstreamcerts.rst
index af2e2226..af2e2226 100644
--- a/docs/features/upstreamcerts.rst
+++ b/mitmproxy/docs/features/upstreamcerts.rst
diff --git a/docs/features/upstreamproxy.rst b/mitmproxy/docs/features/upstreamproxy.rst
index e06833c2..e06833c2 100644
--- a/docs/features/upstreamproxy.rst
+++ b/mitmproxy/docs/features/upstreamproxy.rst
diff --git a/docs/howmitmproxy.rst b/mitmproxy/docs/howmitmproxy.rst
index 7dcb4c30..7dcb4c30 100644
--- a/docs/howmitmproxy.rst
+++ b/mitmproxy/docs/howmitmproxy.rst
diff --git a/docs/index.rst b/mitmproxy/docs/index.rst
index 30fb4027..30fb4027 100644
--- a/docs/index.rst
+++ b/mitmproxy/docs/index.rst
diff --git a/docs/install.rst b/mitmproxy/docs/install.rst
index 3300807b..3300807b 100644
--- a/docs/install.rst
+++ b/mitmproxy/docs/install.rst
diff --git a/docs/introduction.rst b/mitmproxy/docs/introduction.rst
index c8593daf..c8593daf 100644
--- a/docs/introduction.rst
+++ b/mitmproxy/docs/introduction.rst
diff --git a/docs/mitmdump.rst b/mitmproxy/docs/mitmdump.rst
index d9b4a26b..d9b4a26b 100644
--- a/docs/mitmdump.rst
+++ b/mitmproxy/docs/mitmdump.rst
diff --git a/docs/mitmproxy-docs.png b/mitmproxy/docs/mitmproxy-docs.png
index 273fb8db..273fb8db 100644
--- a/docs/mitmproxy-docs.png
+++ b/mitmproxy/docs/mitmproxy-docs.png
diff --git a/docs/mitmproxy-long.png b/mitmproxy/docs/mitmproxy-long.png
index f9397d1e..f9397d1e 100644
--- a/docs/mitmproxy-long.png
+++ b/mitmproxy/docs/mitmproxy-long.png
diff --git a/docs/mitmproxy.rst b/mitmproxy/docs/mitmproxy.rst
index fa3b57c7..fa3b57c7 100644
--- a/docs/mitmproxy.rst
+++ b/mitmproxy/docs/mitmproxy.rst
diff --git a/docs/modes.rst b/mitmproxy/docs/modes.rst
index 2c87b2a3..2c87b2a3 100644
--- a/docs/modes.rst
+++ b/mitmproxy/docs/modes.rst
diff --git a/docs/schematics/_explicit.graffle/data.plist b/mitmproxy/docs/schematics/_explicit.graffle/data.plist
index bc5ef104..bc5ef104 100644
--- a/docs/schematics/_explicit.graffle/data.plist
+++ b/mitmproxy/docs/schematics/_explicit.graffle/data.plist
diff --git a/docs/schematics/_explicit.graffle/image3.icns b/mitmproxy/docs/schematics/_explicit.graffle/image3.icns
index 964df4b8..964df4b8 100644
--- a/docs/schematics/_explicit.graffle/image3.icns
+++ b/mitmproxy/docs/schematics/_explicit.graffle/image3.icns
diff --git a/docs/schematics/_explicit.graffle/image6.tiff b/mitmproxy/docs/schematics/_explicit.graffle/image6.tiff
index bd6ed534..bd6ed534 100644
--- a/docs/schematics/_explicit.graffle/image6.tiff
+++ b/mitmproxy/docs/schematics/_explicit.graffle/image6.tiff
diff --git a/docs/schematics/_explicit_https.graffle/data.plist b/mitmproxy/docs/schematics/_explicit_https.graffle/data.plist
index 306630a0..306630a0 100644
--- a/docs/schematics/_explicit_https.graffle/data.plist
+++ b/mitmproxy/docs/schematics/_explicit_https.graffle/data.plist
diff --git a/docs/schematics/_explicit_https.graffle/image3.icns b/mitmproxy/docs/schematics/_explicit_https.graffle/image3.icns
index 964df4b8..964df4b8 100644
--- a/docs/schematics/_explicit_https.graffle/image3.icns
+++ b/mitmproxy/docs/schematics/_explicit_https.graffle/image3.icns
diff --git a/docs/schematics/_explicit_https.graffle/image6.tiff b/mitmproxy/docs/schematics/_explicit_https.graffle/image6.tiff
index bd6ed534..bd6ed534 100644
--- a/docs/schematics/_explicit_https.graffle/image6.tiff
+++ b/mitmproxy/docs/schematics/_explicit_https.graffle/image6.tiff
diff --git a/docs/schematics/_transparent.graffle/data.plist b/mitmproxy/docs/schematics/_transparent.graffle/data.plist
index 722b4a44..722b4a44 100644
--- a/docs/schematics/_transparent.graffle/data.plist
+++ b/mitmproxy/docs/schematics/_transparent.graffle/data.plist
diff --git a/docs/schematics/_transparent.graffle/image3.icns b/mitmproxy/docs/schematics/_transparent.graffle/image3.icns
index 964df4b8..964df4b8 100644
--- a/docs/schematics/_transparent.graffle/image3.icns
+++ b/mitmproxy/docs/schematics/_transparent.graffle/image3.icns
diff --git a/docs/schematics/_transparent.graffle/image6.tiff b/mitmproxy/docs/schematics/_transparent.graffle/image6.tiff
index bd6ed534..bd6ed534 100644
--- a/docs/schematics/_transparent.graffle/image6.tiff
+++ b/mitmproxy/docs/schematics/_transparent.graffle/image6.tiff
diff --git a/docs/schematics/_transparent_https.graffle/data.plist b/mitmproxy/docs/schematics/_transparent_https.graffle/data.plist
index 9c1395d7..9c1395d7 100644
--- a/docs/schematics/_transparent_https.graffle/data.plist
+++ b/mitmproxy/docs/schematics/_transparent_https.graffle/data.plist
diff --git a/docs/schematics/_transparent_https.graffle/image3.icns b/mitmproxy/docs/schematics/_transparent_https.graffle/image3.icns
index 964df4b8..964df4b8 100644
--- a/docs/schematics/_transparent_https.graffle/image3.icns
+++ b/mitmproxy/docs/schematics/_transparent_https.graffle/image3.icns
diff --git a/docs/schematics/_transparent_https.graffle/image6.tiff b/mitmproxy/docs/schematics/_transparent_https.graffle/image6.tiff
index bd6ed534..bd6ed534 100644
--- a/docs/schematics/_transparent_https.graffle/image6.tiff
+++ b/mitmproxy/docs/schematics/_transparent_https.graffle/image6.tiff
diff --git a/docs/schematics/architecture.pdf b/mitmproxy/docs/schematics/architecture.pdf
index 77f5ad58..77f5ad58 100644
--- a/docs/schematics/architecture.pdf
+++ b/mitmproxy/docs/schematics/architecture.pdf
diff --git a/docs/schematics/architecture.png b/mitmproxy/docs/schematics/architecture.png
index 67d6c718..67d6c718 100644
--- a/docs/schematics/architecture.png
+++ b/mitmproxy/docs/schematics/architecture.png
diff --git a/docs/schematics/architecture.vsdx b/mitmproxy/docs/schematics/architecture.vsdx
index c4ff13d2..c4ff13d2 100644
--- a/docs/schematics/architecture.vsdx
+++ b/mitmproxy/docs/schematics/architecture.vsdx
diff --git a/docs/schematics/how-mitmproxy-works-explicit-https.png b/mitmproxy/docs/schematics/how-mitmproxy-works-explicit-https.png
index 1f1ca023..1f1ca023 100644
--- a/docs/schematics/how-mitmproxy-works-explicit-https.png
+++ b/mitmproxy/docs/schematics/how-mitmproxy-works-explicit-https.png
diff --git a/docs/schematics/how-mitmproxy-works-explicit.png b/mitmproxy/docs/schematics/how-mitmproxy-works-explicit.png
index c9ba26a7..c9ba26a7 100644
--- a/docs/schematics/how-mitmproxy-works-explicit.png
+++ b/mitmproxy/docs/schematics/how-mitmproxy-works-explicit.png
diff --git a/docs/schematics/how-mitmproxy-works-transparent-https.png b/mitmproxy/docs/schematics/how-mitmproxy-works-transparent-https.png
index 559cddd2..559cddd2 100644
--- a/docs/schematics/how-mitmproxy-works-transparent-https.png
+++ b/mitmproxy/docs/schematics/how-mitmproxy-works-transparent-https.png
diff --git a/docs/schematics/how-mitmproxy-works-transparent.png b/mitmproxy/docs/schematics/how-mitmproxy-works-transparent.png
index 3994d681..3994d681 100644
--- a/docs/schematics/how-mitmproxy-works-transparent.png
+++ b/mitmproxy/docs/schematics/how-mitmproxy-works-transparent.png
diff --git a/docs/schematics/proxy-modes-flowchart.png b/mitmproxy/docs/schematics/proxy-modes-flowchart.png
index e9568dac..e9568dac 100644
--- a/docs/schematics/proxy-modes-flowchart.png
+++ b/mitmproxy/docs/schematics/proxy-modes-flowchart.png
diff --git a/docs/schematics/proxy-modes-regular.png b/mitmproxy/docs/schematics/proxy-modes-regular.png
index 95bada08..95bada08 100644
--- a/docs/schematics/proxy-modes-regular.png
+++ b/mitmproxy/docs/schematics/proxy-modes-regular.png
diff --git a/docs/schematics/proxy-modes-reverse.png b/mitmproxy/docs/schematics/proxy-modes-reverse.png
index 071d3fc8..071d3fc8 100644
--- a/docs/schematics/proxy-modes-reverse.png
+++ b/mitmproxy/docs/schematics/proxy-modes-reverse.png
diff --git a/docs/schematics/proxy-modes-transparent-1.png b/mitmproxy/docs/schematics/proxy-modes-transparent-1.png
index 002e0e76..002e0e76 100644
--- a/docs/schematics/proxy-modes-transparent-1.png
+++ b/mitmproxy/docs/schematics/proxy-modes-transparent-1.png
diff --git a/docs/schematics/proxy-modes-transparent-2.png b/mitmproxy/docs/schematics/proxy-modes-transparent-2.png
index 41997b05..41997b05 100644
--- a/docs/schematics/proxy-modes-transparent-2.png
+++ b/mitmproxy/docs/schematics/proxy-modes-transparent-2.png
diff --git a/docs/schematics/proxy-modes-transparent-3.png b/mitmproxy/docs/schematics/proxy-modes-transparent-3.png
index ee26cb4f..ee26cb4f 100644
--- a/docs/schematics/proxy-modes-transparent-3.png
+++ b/mitmproxy/docs/schematics/proxy-modes-transparent-3.png
diff --git a/docs/schematics/proxy-modes-transparent-wrong.png b/mitmproxy/docs/schematics/proxy-modes-transparent-wrong.png
index ca501e93..ca501e93 100644
--- a/docs/schematics/proxy-modes-transparent-wrong.png
+++ b/mitmproxy/docs/schematics/proxy-modes-transparent-wrong.png
diff --git a/docs/schematics/proxy-modes-upstream.png b/mitmproxy/docs/schematics/proxy-modes-upstream.png
index d40a6494..d40a6494 100644
--- a/docs/schematics/proxy-modes-upstream.png
+++ b/mitmproxy/docs/schematics/proxy-modes-upstream.png
diff --git a/docs/schematics/proxy-modes.pdf b/mitmproxy/docs/schematics/proxy-modes.pdf
index f07ea05e..f07ea05e 100644
--- a/docs/schematics/proxy-modes.pdf
+++ b/mitmproxy/docs/schematics/proxy-modes.pdf
diff --git a/docs/schematics/proxy-modes.vsdx b/mitmproxy/docs/schematics/proxy-modes.vsdx
index 0128a142..0128a142 100644
--- a/docs/schematics/proxy-modes.vsdx
+++ b/mitmproxy/docs/schematics/proxy-modes.vsdx
diff --git a/docs/screenshots/firefox3-import.jpg b/mitmproxy/docs/screenshots/firefox3-import.jpg
index 47fcd672..47fcd672 100644
--- a/docs/screenshots/firefox3-import.jpg
+++ b/mitmproxy/docs/screenshots/firefox3-import.jpg
diff --git a/docs/screenshots/firefox3-trust.jpg b/mitmproxy/docs/screenshots/firefox3-trust.jpg
index 50a2f341..50a2f341 100644
--- a/docs/screenshots/firefox3-trust.jpg
+++ b/mitmproxy/docs/screenshots/firefox3-trust.jpg
diff --git a/docs/screenshots/firefox3.jpg b/mitmproxy/docs/screenshots/firefox3.jpg
index 6c4613b6..6c4613b6 100644
--- a/docs/screenshots/firefox3.jpg
+++ b/mitmproxy/docs/screenshots/firefox3.jpg
diff --git a/docs/screenshots/ios-gateway.png b/mitmproxy/docs/screenshots/ios-gateway.png
index 2489cba3..2489cba3 100644
--- a/docs/screenshots/ios-gateway.png
+++ b/mitmproxy/docs/screenshots/ios-gateway.png
diff --git a/docs/screenshots/ios-installed.png b/mitmproxy/docs/screenshots/ios-installed.png
index 2071e441..2071e441 100644
--- a/docs/screenshots/ios-installed.png
+++ b/mitmproxy/docs/screenshots/ios-installed.png
diff --git a/docs/screenshots/ios-manual.png b/mitmproxy/docs/screenshots/ios-manual.png
index 3977acfe..3977acfe 100644
--- a/docs/screenshots/ios-manual.png
+++ b/mitmproxy/docs/screenshots/ios-manual.png
diff --git a/docs/screenshots/ios-profile.png b/mitmproxy/docs/screenshots/ios-profile.png
index 5bcd5a0d..5bcd5a0d 100644
--- a/docs/screenshots/ios-profile.png
+++ b/mitmproxy/docs/screenshots/ios-profile.png
diff --git a/docs/screenshots/ios-reverse.png b/mitmproxy/docs/screenshots/ios-reverse.png
index 6ab5b7c0..6ab5b7c0 100644
--- a/docs/screenshots/ios-reverse.png
+++ b/mitmproxy/docs/screenshots/ios-reverse.png
diff --git a/docs/screenshots/ios-warning.png b/mitmproxy/docs/screenshots/ios-warning.png
index d882c514..d882c514 100644
--- a/docs/screenshots/ios-warning.png
+++ b/mitmproxy/docs/screenshots/ios-warning.png
diff --git a/docs/screenshots/mitmproxy-flowview.png b/mitmproxy/docs/screenshots/mitmproxy-flowview.png
index 154963fe..154963fe 100644
--- a/docs/screenshots/mitmproxy-flowview.png
+++ b/mitmproxy/docs/screenshots/mitmproxy-flowview.png
diff --git a/docs/screenshots/mitmproxy-intercept-filt.png b/mitmproxy/docs/screenshots/mitmproxy-intercept-filt.png
index 60556ee7..60556ee7 100644
--- a/docs/screenshots/mitmproxy-intercept-filt.png
+++ b/mitmproxy/docs/screenshots/mitmproxy-intercept-filt.png
diff --git a/docs/screenshots/mitmproxy-intercept-mid.png b/mitmproxy/docs/screenshots/mitmproxy-intercept-mid.png
index d5b03922..d5b03922 100644
--- a/docs/screenshots/mitmproxy-intercept-mid.png
+++ b/mitmproxy/docs/screenshots/mitmproxy-intercept-mid.png
diff --git a/docs/screenshots/mitmproxy-intercept-options.png b/mitmproxy/docs/screenshots/mitmproxy-intercept-options.png
index 8dc4ad2c..8dc4ad2c 100644
--- a/docs/screenshots/mitmproxy-intercept-options.png
+++ b/mitmproxy/docs/screenshots/mitmproxy-intercept-options.png
diff --git a/docs/screenshots/mitmproxy-intercept-result.png b/mitmproxy/docs/screenshots/mitmproxy-intercept-result.png
index 7d9f5c94..7d9f5c94 100644
--- a/docs/screenshots/mitmproxy-intercept-result.png
+++ b/mitmproxy/docs/screenshots/mitmproxy-intercept-result.png
diff --git a/docs/screenshots/mitmproxy-kveditor-editmode.png b/mitmproxy/docs/screenshots/mitmproxy-kveditor-editmode.png
index a8315ee5..a8315ee5 100644
--- a/docs/screenshots/mitmproxy-kveditor-editmode.png
+++ b/mitmproxy/docs/screenshots/mitmproxy-kveditor-editmode.png
diff --git a/docs/screenshots/mitmproxy-kveditor.png b/mitmproxy/docs/screenshots/mitmproxy-kveditor.png
index 144b9701..144b9701 100644
--- a/docs/screenshots/mitmproxy-kveditor.png
+++ b/mitmproxy/docs/screenshots/mitmproxy-kveditor.png
diff --git a/docs/screenshots/mitmproxy.png b/mitmproxy/docs/screenshots/mitmproxy.png
index 42a10e32..42a10e32 100644
--- a/docs/screenshots/mitmproxy.png
+++ b/mitmproxy/docs/screenshots/mitmproxy.png
diff --git a/docs/screenshots/osx-addcert-alwaystrust.png b/mitmproxy/docs/screenshots/osx-addcert-alwaystrust.png
index 4c5cc704..4c5cc704 100644
--- a/docs/screenshots/osx-addcert-alwaystrust.png
+++ b/mitmproxy/docs/screenshots/osx-addcert-alwaystrust.png
diff --git a/docs/screenshots/win7-certstore-trustedroot.png b/mitmproxy/docs/screenshots/win7-certstore-trustedroot.png
index e15a87f5..e15a87f5 100644
--- a/docs/screenshots/win7-certstore-trustedroot.png
+++ b/mitmproxy/docs/screenshots/win7-certstore-trustedroot.png
diff --git a/docs/screenshots/win7-certstore.png b/mitmproxy/docs/screenshots/win7-certstore.png
index f8ce54bd..f8ce54bd 100644
--- a/docs/screenshots/win7-certstore.png
+++ b/mitmproxy/docs/screenshots/win7-certstore.png
diff --git a/docs/screenshots/win7-wizard.png b/mitmproxy/docs/screenshots/win7-wizard.png
index eff6ad09..eff6ad09 100644
--- a/docs/screenshots/win7-wizard.png
+++ b/mitmproxy/docs/screenshots/win7-wizard.png
diff --git a/docs/screenshots/winpythoninstaller.jpg b/mitmproxy/docs/screenshots/winpythoninstaller.jpg
index 0473c66a..0473c66a 100644
--- a/docs/screenshots/winpythoninstaller.jpg
+++ b/mitmproxy/docs/screenshots/winpythoninstaller.jpg
diff --git a/docs/scripting/inlinescripts.rst b/mitmproxy/docs/scripting/inlinescripts.rst
index 27e4abef..27e4abef 100644
--- a/docs/scripting/inlinescripts.rst
+++ b/mitmproxy/docs/scripting/inlinescripts.rst
diff --git a/docs/scripting/libmproxy.rst b/mitmproxy/docs/scripting/libmproxy.rst
index 92fa5277..92fa5277 100644
--- a/docs/scripting/libmproxy.rst
+++ b/mitmproxy/docs/scripting/libmproxy.rst
diff --git a/docs/transparent.rst b/mitmproxy/docs/transparent.rst
index eb77c76c..eb77c76c 100644
--- a/docs/transparent.rst
+++ b/mitmproxy/docs/transparent.rst
diff --git a/docs/transparent/linux.rst b/mitmproxy/docs/transparent/linux.rst
index ce79128c..ce79128c 100644
--- a/docs/transparent/linux.rst
+++ b/mitmproxy/docs/transparent/linux.rst
diff --git a/docs/transparent/osx.rst b/mitmproxy/docs/transparent/osx.rst
index 1791105f..1791105f 100644
--- a/docs/transparent/osx.rst
+++ b/mitmproxy/docs/transparent/osx.rst
diff --git a/docs/tutorials/30second.rst b/mitmproxy/docs/tutorials/30second.rst
index 4c8bf326..4c8bf326 100644
--- a/docs/tutorials/30second.rst
+++ b/mitmproxy/docs/tutorials/30second.rst
diff --git a/docs/tutorials/gamecenter.rst b/mitmproxy/docs/tutorials/gamecenter.rst
index 9dce5df8..9dce5df8 100644
--- a/docs/tutorials/gamecenter.rst
+++ b/mitmproxy/docs/tutorials/gamecenter.rst
diff --git a/docs/tutorials/leaderboard.png b/mitmproxy/docs/tutorials/leaderboard.png
index c1be8df5..c1be8df5 100644
--- a/docs/tutorials/leaderboard.png
+++ b/mitmproxy/docs/tutorials/leaderboard.png
diff --git a/docs/tutorials/one.png b/mitmproxy/docs/tutorials/one.png
index 78a636cf..78a636cf 100644
--- a/docs/tutorials/one.png
+++ b/mitmproxy/docs/tutorials/one.png
diff --git a/docs/tutorials/supermega.png b/mitmproxy/docs/tutorials/supermega.png
index d416f71f..d416f71f 100644
--- a/docs/tutorials/supermega.png
+++ b/mitmproxy/docs/tutorials/supermega.png
diff --git a/docs/tutorials/transparent-dhcp.rst b/mitmproxy/docs/tutorials/transparent-dhcp.rst
index ce285b63..ce285b63 100644
--- a/docs/tutorials/transparent-dhcp.rst
+++ b/mitmproxy/docs/tutorials/transparent-dhcp.rst
diff --git a/docs/tutorials/transparent-dhcp/step1_proxy.png b/mitmproxy/docs/tutorials/transparent-dhcp/step1_proxy.png
index a0c94484..a0c94484 100644
--- a/docs/tutorials/transparent-dhcp/step1_proxy.png
+++ b/mitmproxy/docs/tutorials/transparent-dhcp/step1_proxy.png
diff --git a/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png b/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png
index 4b7b4e9b..4b7b4e9b 100644
--- a/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png
+++ b/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png
diff --git a/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png b/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png
index b994d4cb..b994d4cb 100644
--- a/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png
+++ b/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png
diff --git a/docs/tutorials/transparent-dhcp/step2_proxied_vm.png b/mitmproxy/docs/tutorials/transparent-dhcp/step2_proxied_vm.png
index 2046cc57..2046cc57 100644
--- a/docs/tutorials/transparent-dhcp/step2_proxied_vm.png
+++ b/mitmproxy/docs/tutorials/transparent-dhcp/step2_proxied_vm.png
diff --git a/examples/README b/mitmproxy/examples/README
index b4dec8e5..b4dec8e5 100644
--- a/examples/README
+++ b/mitmproxy/examples/README
diff --git a/examples/add_header.py b/mitmproxy/examples/add_header.py
index cf1b53cc..cf1b53cc 100644
--- a/examples/add_header.py
+++ b/mitmproxy/examples/add_header.py
diff --git a/examples/change_upstream_proxy.py b/mitmproxy/examples/change_upstream_proxy.py
index 9c454897..9c454897 100644
--- a/examples/change_upstream_proxy.py
+++ b/mitmproxy/examples/change_upstream_proxy.py
diff --git a/examples/custom_contentviews.py b/mitmproxy/examples/custom_contentviews.py
index 17920e51..17920e51 100644
--- a/examples/custom_contentviews.py
+++ b/mitmproxy/examples/custom_contentviews.py
diff --git a/examples/dns_spoofing.py b/mitmproxy/examples/dns_spoofing.py
index 7eb79695..7eb79695 100644
--- a/examples/dns_spoofing.py
+++ b/mitmproxy/examples/dns_spoofing.py
diff --git a/examples/dup_and_replay.py b/mitmproxy/examples/dup_and_replay.py
index 9ba91d3b..9ba91d3b 100644
--- a/examples/dup_and_replay.py
+++ b/mitmproxy/examples/dup_and_replay.py
diff --git a/examples/filt.py b/mitmproxy/examples/filt.py
index d2daf9a2..d2daf9a2 100644
--- a/examples/filt.py
+++ b/mitmproxy/examples/filt.py
diff --git a/examples/flowbasic b/mitmproxy/examples/flowbasic
index 78b9eff7..78b9eff7 100755..100644
--- a/examples/flowbasic
+++ b/mitmproxy/examples/flowbasic
diff --git a/examples/flowwriter.py b/mitmproxy/examples/flowwriter.py
index be2f285e..be2f285e 100644
--- a/examples/flowwriter.py
+++ b/mitmproxy/examples/flowwriter.py
diff --git a/examples/har_extractor.py b/mitmproxy/examples/har_extractor.py
index 4e905438..4e905438 100644
--- a/examples/har_extractor.py
+++ b/mitmproxy/examples/har_extractor.py
diff --git a/examples/iframe_injector.py b/mitmproxy/examples/iframe_injector.py
index 29de9b63..29de9b63 100644
--- a/examples/iframe_injector.py
+++ b/mitmproxy/examples/iframe_injector.py
diff --git a/examples/mitmproxywrapper.py b/mitmproxy/examples/mitmproxywrapper.py
index 7ea10715..7ea10715 100755..100644
--- a/examples/mitmproxywrapper.py
+++ b/mitmproxy/examples/mitmproxywrapper.py
diff --git a/examples/modify_form.py b/mitmproxy/examples/modify_form.py
index 3e9d15c0..3e9d15c0 100644
--- a/examples/modify_form.py
+++ b/mitmproxy/examples/modify_form.py
diff --git a/examples/modify_querystring.py b/mitmproxy/examples/modify_querystring.py
index 7f31a48f..7f31a48f 100644
--- a/examples/modify_querystring.py
+++ b/mitmproxy/examples/modify_querystring.py
diff --git a/examples/modify_response_body.py b/mitmproxy/examples/modify_response_body.py
index a35e1525..a35e1525 100644
--- a/examples/modify_response_body.py
+++ b/mitmproxy/examples/modify_response_body.py
diff --git a/examples/nonblocking.py b/mitmproxy/examples/nonblocking.py
index 7bc9c07b..7bc9c07b 100644
--- a/examples/nonblocking.py
+++ b/mitmproxy/examples/nonblocking.py
diff --git a/examples/proxapp.py b/mitmproxy/examples/proxapp.py
index 4d8e7b58..4d8e7b58 100644
--- a/examples/proxapp.py
+++ b/mitmproxy/examples/proxapp.py
diff --git a/examples/read_dumpfile b/mitmproxy/examples/read_dumpfile
index b329c0e1..b329c0e1 100755..100644
--- a/examples/read_dumpfile
+++ b/mitmproxy/examples/read_dumpfile
diff --git a/examples/redirect_requests.py b/mitmproxy/examples/redirect_requests.py
index a3145083..a3145083 100644
--- a/examples/redirect_requests.py
+++ b/mitmproxy/examples/redirect_requests.py
diff --git a/examples/sslstrip.py b/mitmproxy/examples/sslstrip.py
index 369427a2..369427a2 100644
--- a/examples/sslstrip.py
+++ b/mitmproxy/examples/sslstrip.py
diff --git a/examples/stickycookies b/mitmproxy/examples/stickycookies
index 7e84f71c..7e84f71c 100755..100644
--- a/examples/stickycookies
+++ b/mitmproxy/examples/stickycookies
diff --git a/examples/stream.py b/mitmproxy/examples/stream.py
index 3adbe437..3adbe437 100644
--- a/examples/stream.py
+++ b/mitmproxy/examples/stream.py
diff --git a/examples/stream_modify.py b/mitmproxy/examples/stream_modify.py
index aa395c03..aa395c03 100644
--- a/examples/stream_modify.py
+++ b/mitmproxy/examples/stream_modify.py
diff --git a/examples/stub.py b/mitmproxy/examples/stub.py
index 516b71a5..516b71a5 100644
--- a/examples/stub.py
+++ b/mitmproxy/examples/stub.py
diff --git a/examples/tcp_message.py b/mitmproxy/examples/tcp_message.py
index c63368e4..c63368e4 100644
--- a/examples/tcp_message.py
+++ b/mitmproxy/examples/tcp_message.py
diff --git a/examples/tls_passthrough.py b/mitmproxy/examples/tls_passthrough.py
index 0d41b725..0d41b725 100644
--- a/examples/tls_passthrough.py
+++ b/mitmproxy/examples/tls_passthrough.py
diff --git a/examples/upsidedownternet.py b/mitmproxy/examples/upsidedownternet.py
index f2e73047..f2e73047 100644
--- a/examples/upsidedownternet.py
+++ b/mitmproxy/examples/upsidedownternet.py
diff --git a/libmproxy/__init__.py b/mitmproxy/libmproxy/__init__.py
index e69de29b..e69de29b 100644
--- a/libmproxy/__init__.py
+++ b/mitmproxy/libmproxy/__init__.py
diff --git a/libmproxy/cmdline.py b/mitmproxy/libmproxy/cmdline.py
index b1cbfa3a..b1cbfa3a 100644
--- a/libmproxy/cmdline.py
+++ b/mitmproxy/libmproxy/cmdline.py
diff --git a/libmproxy/console/__init__.py b/mitmproxy/libmproxy/console/__init__.py
index e739ec61..e739ec61 100644
--- a/libmproxy/console/__init__.py
+++ b/mitmproxy/libmproxy/console/__init__.py
diff --git a/libmproxy/console/common.py b/mitmproxy/libmproxy/console/common.py
index c29ffddc..c29ffddc 100644
--- a/libmproxy/console/common.py
+++ b/mitmproxy/libmproxy/console/common.py
diff --git a/libmproxy/console/flowdetailview.py b/mitmproxy/libmproxy/console/flowdetailview.py
index f4b4262e..f4b4262e 100644
--- a/libmproxy/console/flowdetailview.py
+++ b/mitmproxy/libmproxy/console/flowdetailview.py
diff --git a/libmproxy/console/flowlist.py b/mitmproxy/libmproxy/console/flowlist.py
index c2201055..c2201055 100644
--- a/libmproxy/console/flowlist.py
+++ b/mitmproxy/libmproxy/console/flowlist.py
diff --git a/libmproxy/console/flowview.py b/mitmproxy/libmproxy/console/flowview.py
index d2b98b68..d2b98b68 100644
--- a/libmproxy/console/flowview.py
+++ b/mitmproxy/libmproxy/console/flowview.py
diff --git a/libmproxy/console/grideditor.py b/mitmproxy/libmproxy/console/grideditor.py
index a11c962c..a11c962c 100644
--- a/libmproxy/console/grideditor.py
+++ b/mitmproxy/libmproxy/console/grideditor.py
diff --git a/libmproxy/console/help.py b/mitmproxy/libmproxy/console/help.py
index 0c264ebf..0c264ebf 100644
--- a/libmproxy/console/help.py
+++ b/mitmproxy/libmproxy/console/help.py
diff --git a/libmproxy/console/options.py b/mitmproxy/libmproxy/console/options.py
index 5c9e0cc9..5c9e0cc9 100644
--- a/libmproxy/console/options.py
+++ b/mitmproxy/libmproxy/console/options.py
diff --git a/libmproxy/console/palettepicker.py b/mitmproxy/libmproxy/console/palettepicker.py
index 51ad0606..51ad0606 100644
--- a/libmproxy/console/palettepicker.py
+++ b/mitmproxy/libmproxy/console/palettepicker.py
diff --git a/libmproxy/console/palettes.py b/mitmproxy/libmproxy/console/palettes.py
index bd370181..bd370181 100644
--- a/libmproxy/console/palettes.py
+++ b/mitmproxy/libmproxy/console/palettes.py
diff --git a/libmproxy/console/pathedit.py b/mitmproxy/libmproxy/console/pathedit.py
index 4447070b..4447070b 100644
--- a/libmproxy/console/pathedit.py
+++ b/mitmproxy/libmproxy/console/pathedit.py
diff --git a/libmproxy/console/searchable.py b/mitmproxy/libmproxy/console/searchable.py
index cff1f0a1..cff1f0a1 100644
--- a/libmproxy/console/searchable.py
+++ b/mitmproxy/libmproxy/console/searchable.py
diff --git a/libmproxy/console/select.py b/mitmproxy/libmproxy/console/select.py
index 928a7ca5..928a7ca5 100644
--- a/libmproxy/console/select.py
+++ b/mitmproxy/libmproxy/console/select.py
diff --git a/libmproxy/console/signals.py b/mitmproxy/libmproxy/console/signals.py
index 6a439bf3..6a439bf3 100644
--- a/libmproxy/console/signals.py
+++ b/mitmproxy/libmproxy/console/signals.py
diff --git a/libmproxy/console/statusbar.py b/mitmproxy/libmproxy/console/statusbar.py
index 4cc63a54..4cc63a54 100644
--- a/libmproxy/console/statusbar.py
+++ b/mitmproxy/libmproxy/console/statusbar.py
diff --git a/libmproxy/console/tabs.py b/mitmproxy/libmproxy/console/tabs.py
index b5423038..b5423038 100644
--- a/libmproxy/console/tabs.py
+++ b/mitmproxy/libmproxy/console/tabs.py
diff --git a/libmproxy/console/window.py b/mitmproxy/libmproxy/console/window.py
index 47c284e4..47c284e4 100644
--- a/libmproxy/console/window.py
+++ b/mitmproxy/libmproxy/console/window.py
diff --git a/libmproxy/contentviews.py b/mitmproxy/libmproxy/contentviews.py
index c0652c18..c0652c18 100644
--- a/libmproxy/contentviews.py
+++ b/mitmproxy/libmproxy/contentviews.py
diff --git a/libmproxy/contrib/README b/mitmproxy/libmproxy/contrib/README
index e5ce11da..e5ce11da 100644
--- a/libmproxy/contrib/README
+++ b/mitmproxy/libmproxy/contrib/README
diff --git a/libmproxy/contrib/__init__.py b/mitmproxy/libmproxy/contrib/__init__.py
index e69de29b..e69de29b 100644
--- a/libmproxy/contrib/__init__.py
+++ b/mitmproxy/libmproxy/contrib/__init__.py
diff --git a/libmproxy/contrib/jsbeautifier/__init__.py b/mitmproxy/libmproxy/contrib/jsbeautifier/__init__.py
index e319e8dd..e319e8dd 100644
--- a/libmproxy/contrib/jsbeautifier/__init__.py
+++ b/mitmproxy/libmproxy/contrib/jsbeautifier/__init__.py
diff --git a/libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd
index e937b762..e937b762 100644
--- a/libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd
+++ b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/README.specs.mkd
diff --git a/libmproxy/contrib/jsbeautifier/unpackers/__init__.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
index fcb5b07a..fcb5b07a 100644
--- a/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
+++ b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
diff --git a/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py
index b17d926e..b17d926e 100644
--- a/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py
+++ b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/evalbased.py
diff --git a/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py
index aa4344a3..aa4344a3 100644
--- a/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py
+++ b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/javascriptobfuscator.py
diff --git a/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
index 9893f95f..9893f95f 100644
--- a/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
+++ b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
diff --git a/libmproxy/contrib/jsbeautifier/unpackers/packer.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/packer.py
index 4ada669e..4ada669e 100644
--- a/libmproxy/contrib/jsbeautifier/unpackers/packer.py
+++ b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/packer.py
diff --git a/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py
index 72d2bd1c..72d2bd1c 100644
--- a/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py
+++ b/mitmproxy/libmproxy/contrib/jsbeautifier/unpackers/urlencode.py
diff --git a/libmproxy/contrib/tls/__init__.py b/mitmproxy/libmproxy/contrib/tls/__init__.py
index 4b540884..4b540884 100644
--- a/libmproxy/contrib/tls/__init__.py
+++ b/mitmproxy/libmproxy/contrib/tls/__init__.py
diff --git a/libmproxy/contrib/tls/_constructs.py b/mitmproxy/libmproxy/contrib/tls/_constructs.py
index 4cb7d382..4cb7d382 100644
--- a/libmproxy/contrib/tls/_constructs.py
+++ b/mitmproxy/libmproxy/contrib/tls/_constructs.py
diff --git a/libmproxy/contrib/tls/utils.py b/mitmproxy/libmproxy/contrib/tls/utils.py
index 4c917303..4c917303 100644
--- a/libmproxy/contrib/tls/utils.py
+++ b/mitmproxy/libmproxy/contrib/tls/utils.py
diff --git a/libmproxy/contrib/wbxml/ASCommandResponse.py b/mitmproxy/libmproxy/contrib/wbxml/ASCommandResponse.py
index 08d03445..08d03445 100644
--- a/libmproxy/contrib/wbxml/ASCommandResponse.py
+++ b/mitmproxy/libmproxy/contrib/wbxml/ASCommandResponse.py
diff --git a/libmproxy/contrib/wbxml/ASWBXML.py b/mitmproxy/libmproxy/contrib/wbxml/ASWBXML.py
index 926d18c0..926d18c0 100644
--- a/libmproxy/contrib/wbxml/ASWBXML.py
+++ b/mitmproxy/libmproxy/contrib/wbxml/ASWBXML.py
diff --git a/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py b/mitmproxy/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py
index c7a9e0a5..c7a9e0a5 100644
--- a/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py
+++ b/mitmproxy/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py
diff --git a/libmproxy/contrib/wbxml/ASWBXMLCodePage.py b/mitmproxy/libmproxy/contrib/wbxml/ASWBXMLCodePage.py
index 2f9d8717..2f9d8717 100644
--- a/libmproxy/contrib/wbxml/ASWBXMLCodePage.py
+++ b/mitmproxy/libmproxy/contrib/wbxml/ASWBXMLCodePage.py
diff --git a/libmproxy/contrib/wbxml/GlobalTokens.py b/mitmproxy/libmproxy/contrib/wbxml/GlobalTokens.py
index 41310fb1..41310fb1 100644
--- a/libmproxy/contrib/wbxml/GlobalTokens.py
+++ b/mitmproxy/libmproxy/contrib/wbxml/GlobalTokens.py
diff --git a/libmproxy/contrib/wbxml/InvalidDataException.py b/mitmproxy/libmproxy/contrib/wbxml/InvalidDataException.py
index 67f8ea93..67f8ea93 100644
--- a/libmproxy/contrib/wbxml/InvalidDataException.py
+++ b/mitmproxy/libmproxy/contrib/wbxml/InvalidDataException.py
diff --git a/libmproxy/contrib/wbxml/__init__.py b/mitmproxy/libmproxy/contrib/wbxml/__init__.py
index e69de29b..e69de29b 100644
--- a/libmproxy/contrib/wbxml/__init__.py
+++ b/mitmproxy/libmproxy/contrib/wbxml/__init__.py
diff --git a/libmproxy/controller.py b/mitmproxy/libmproxy/controller.py
index 9a059856..9a059856 100644
--- a/libmproxy/controller.py
+++ b/mitmproxy/libmproxy/controller.py
diff --git a/libmproxy/dump.py b/mitmproxy/libmproxy/dump.py
index 6dab2ddc..6dab2ddc 100644
--- a/libmproxy/dump.py
+++ b/mitmproxy/libmproxy/dump.py
diff --git a/libmproxy/exceptions.py b/mitmproxy/libmproxy/exceptions.py
index a5d35263..a5d35263 100644
--- a/libmproxy/exceptions.py
+++ b/mitmproxy/libmproxy/exceptions.py
diff --git a/libmproxy/filt.py b/mitmproxy/libmproxy/filt.py
index aa62b717..aa62b717 100644
--- a/libmproxy/filt.py
+++ b/mitmproxy/libmproxy/filt.py
diff --git a/libmproxy/flow.py b/mitmproxy/libmproxy/flow.py
index ac0d0fbb..ac0d0fbb 100644
--- a/libmproxy/flow.py
+++ b/mitmproxy/libmproxy/flow.py
diff --git a/libmproxy/flow_export.py b/mitmproxy/libmproxy/flow_export.py
index 52145516..52145516 100644
--- a/libmproxy/flow_export.py
+++ b/mitmproxy/libmproxy/flow_export.py
diff --git a/libmproxy/flow_format_compat.py b/mitmproxy/libmproxy/flow_format_compat.py
index a7a95af3..a7a95af3 100644
--- a/libmproxy/flow_format_compat.py
+++ b/mitmproxy/libmproxy/flow_format_compat.py
diff --git a/libmproxy/main.py b/mitmproxy/libmproxy/main.py
index ef135754..ef135754 100644
--- a/libmproxy/main.py
+++ b/mitmproxy/libmproxy/main.py
diff --git a/libmproxy/models/__init__.py b/mitmproxy/libmproxy/models/__init__.py
index 653b19fd..653b19fd 100644
--- a/libmproxy/models/__init__.py
+++ b/mitmproxy/libmproxy/models/__init__.py
diff --git a/libmproxy/models/connections.py b/mitmproxy/libmproxy/models/connections.py
index d5920256..d5920256 100644
--- a/libmproxy/models/connections.py
+++ b/mitmproxy/libmproxy/models/connections.py
diff --git a/libmproxy/models/flow.py b/mitmproxy/libmproxy/models/flow.py
index 10255dad..10255dad 100644
--- a/libmproxy/models/flow.py
+++ b/mitmproxy/libmproxy/models/flow.py
diff --git a/libmproxy/models/http.py b/mitmproxy/libmproxy/models/http.py
index da9c430e..da9c430e 100644
--- a/libmproxy/models/http.py
+++ b/mitmproxy/libmproxy/models/http.py
diff --git a/libmproxy/onboarding/__init__.py b/mitmproxy/libmproxy/onboarding/__init__.py
index e69de29b..e69de29b 100644
--- a/libmproxy/onboarding/__init__.py
+++ b/mitmproxy/libmproxy/onboarding/__init__.py
diff --git a/libmproxy/onboarding/app.py b/mitmproxy/libmproxy/onboarding/app.py
index ff5ed63c..ff5ed63c 100644
--- a/libmproxy/onboarding/app.py
+++ b/mitmproxy/libmproxy/onboarding/app.py
diff --git a/libmproxy/onboarding/static/bootstrap.min.css b/mitmproxy/libmproxy/onboarding/static/bootstrap.min.css
index f31489f9..f31489f9 100644
--- a/libmproxy/onboarding/static/bootstrap.min.css
+++ b/mitmproxy/libmproxy/onboarding/static/bootstrap.min.css
diff --git a/libmproxy/onboarding/static/fontawesome/css/font-awesome.css b/mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.css
index 048cff97..048cff97 100644
--- a/libmproxy/onboarding/static/fontawesome/css/font-awesome.css
+++ b/mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.css
diff --git a/libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css b/mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css
index 449d6ac5..449d6ac5 100644
--- a/libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css
+++ b/mitmproxy/libmproxy/onboarding/static/fontawesome/css/font-awesome.min.css
diff --git a/libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf
index 8b0f54e4..8b0f54e4 100644
--- a/libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf
+++ b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/FontAwesome.otf
diff --git a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot
index 7c79c6a6..7c79c6a6 100755..100644
--- a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot
+++ b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.eot
diff --git a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg
index 45fdf338..45fdf338 100755..100644
--- a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg
+++ b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.svg
diff --git a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf
index e89738de..e89738de 100755..100644
--- a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf
+++ b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.ttf
diff --git a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff
index 8c1748aa..8c1748aa 100755..100644
--- a/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff
+++ b/mitmproxy/libmproxy/onboarding/static/fontawesome/fonts/fontawesome-webfont.woff
diff --git a/libmproxy/onboarding/static/mitmproxy.css b/mitmproxy/libmproxy/onboarding/static/mitmproxy.css
index b390976a..b390976a 100644
--- a/libmproxy/onboarding/static/mitmproxy.css
+++ b/mitmproxy/libmproxy/onboarding/static/mitmproxy.css
diff --git a/libmproxy/onboarding/templates/frame.html b/mitmproxy/libmproxy/onboarding/templates/frame.html
index f00e1a66..f00e1a66 100644
--- a/libmproxy/onboarding/templates/frame.html
+++ b/mitmproxy/libmproxy/onboarding/templates/frame.html
diff --git a/libmproxy/onboarding/templates/index.html b/mitmproxy/libmproxy/onboarding/templates/index.html
index 1bcff1b8..1bcff1b8 100644
--- a/libmproxy/onboarding/templates/index.html
+++ b/mitmproxy/libmproxy/onboarding/templates/index.html
diff --git a/libmproxy/onboarding/templates/layout.html b/mitmproxy/libmproxy/onboarding/templates/layout.html
index 8726a788..8726a788 100644
--- a/libmproxy/onboarding/templates/layout.html
+++ b/mitmproxy/libmproxy/onboarding/templates/layout.html
diff --git a/libmproxy/platform/__init__.py b/mitmproxy/libmproxy/platform/__init__.py
index e1ff7c47..e1ff7c47 100644
--- a/libmproxy/platform/__init__.py
+++ b/mitmproxy/libmproxy/platform/__init__.py
diff --git a/libmproxy/platform/linux.py b/mitmproxy/libmproxy/platform/linux.py
index 38bfbe42..38bfbe42 100644
--- a/libmproxy/platform/linux.py
+++ b/mitmproxy/libmproxy/platform/linux.py
diff --git a/libmproxy/platform/osx.py b/mitmproxy/libmproxy/platform/osx.py
index afbc919b..afbc919b 100644
--- a/libmproxy/platform/osx.py
+++ b/mitmproxy/libmproxy/platform/osx.py
diff --git a/libmproxy/platform/pf.py b/mitmproxy/libmproxy/platform/pf.py
index 97a4c192..97a4c192 100644
--- a/libmproxy/platform/pf.py
+++ b/mitmproxy/libmproxy/platform/pf.py
diff --git a/libmproxy/platform/windows.py b/mitmproxy/libmproxy/platform/windows.py
index 9fe04cfa..9fe04cfa 100644
--- a/libmproxy/platform/windows.py
+++ b/mitmproxy/libmproxy/platform/windows.py
diff --git a/libmproxy/protocol/__init__.py b/mitmproxy/libmproxy/protocol/__init__.py
index ea958d06..ea958d06 100644
--- a/libmproxy/protocol/__init__.py
+++ b/mitmproxy/libmproxy/protocol/__init__.py
diff --git a/libmproxy/protocol/base.py b/mitmproxy/libmproxy/protocol/base.py
index 40fcaf65..40fcaf65 100644
--- a/libmproxy/protocol/base.py
+++ b/mitmproxy/libmproxy/protocol/base.py
diff --git a/libmproxy/protocol/http.py b/mitmproxy/libmproxy/protocol/http.py
index 13d7903b..13d7903b 100644
--- a/libmproxy/protocol/http.py
+++ b/mitmproxy/libmproxy/protocol/http.py
diff --git a/libmproxy/protocol/http1.py b/mitmproxy/libmproxy/protocol/http1.py
index a4cd8801..a4cd8801 100644
--- a/libmproxy/protocol/http1.py
+++ b/mitmproxy/libmproxy/protocol/http1.py
diff --git a/libmproxy/protocol/http2.py b/mitmproxy/libmproxy/protocol/http2.py
index c121637c..c121637c 100644
--- a/libmproxy/protocol/http2.py
+++ b/mitmproxy/libmproxy/protocol/http2.py
diff --git a/libmproxy/protocol/http_replay.py b/mitmproxy/libmproxy/protocol/http_replay.py
index 63870dfb..63870dfb 100644
--- a/libmproxy/protocol/http_replay.py
+++ b/mitmproxy/libmproxy/protocol/http_replay.py
diff --git a/libmproxy/protocol/rawtcp.py b/mitmproxy/libmproxy/protocol/rawtcp.py
index b87899e4..b87899e4 100644
--- a/libmproxy/protocol/rawtcp.py
+++ b/mitmproxy/libmproxy/protocol/rawtcp.py
diff --git a/libmproxy/protocol/tls.py b/mitmproxy/libmproxy/protocol/tls.py
index 378dd7d4..378dd7d4 100644
--- a/libmproxy/protocol/tls.py
+++ b/mitmproxy/libmproxy/protocol/tls.py
diff --git a/libmproxy/proxy/__init__.py b/mitmproxy/libmproxy/proxy/__init__.py
index be7f5207..be7f5207 100644
--- a/libmproxy/proxy/__init__.py
+++ b/mitmproxy/libmproxy/proxy/__init__.py
diff --git a/libmproxy/proxy/config.py b/mitmproxy/libmproxy/proxy/config.py
index a635ab19..a635ab19 100644
--- a/libmproxy/proxy/config.py
+++ b/mitmproxy/libmproxy/proxy/config.py
diff --git a/libmproxy/proxy/modes/__init__.py b/mitmproxy/libmproxy/proxy/modes/__init__.py
index f014ed98..f014ed98 100644
--- a/libmproxy/proxy/modes/__init__.py
+++ b/mitmproxy/libmproxy/proxy/modes/__init__.py
diff --git a/libmproxy/proxy/modes/http_proxy.py b/mitmproxy/libmproxy/proxy/modes/http_proxy.py
index e19062b9..e19062b9 100644
--- a/libmproxy/proxy/modes/http_proxy.py
+++ b/mitmproxy/libmproxy/proxy/modes/http_proxy.py
diff --git a/libmproxy/proxy/modes/reverse_proxy.py b/mitmproxy/libmproxy/proxy/modes/reverse_proxy.py
index c8e80a10..c8e80a10 100644
--- a/libmproxy/proxy/modes/reverse_proxy.py
+++ b/mitmproxy/libmproxy/proxy/modes/reverse_proxy.py
diff --git a/libmproxy/proxy/modes/socks_proxy.py b/mitmproxy/libmproxy/proxy/modes/socks_proxy.py
index e2ce44ae..e2ce44ae 100644
--- a/libmproxy/proxy/modes/socks_proxy.py
+++ b/mitmproxy/libmproxy/proxy/modes/socks_proxy.py
diff --git a/libmproxy/proxy/modes/transparent_proxy.py b/mitmproxy/libmproxy/proxy/modes/transparent_proxy.py
index 3fdda656..3fdda656 100644
--- a/libmproxy/proxy/modes/transparent_proxy.py
+++ b/mitmproxy/libmproxy/proxy/modes/transparent_proxy.py
diff --git a/libmproxy/proxy/root_context.py b/mitmproxy/libmproxy/proxy/root_context.py
index f56aee6d..f56aee6d 100644
--- a/libmproxy/proxy/root_context.py
+++ b/mitmproxy/libmproxy/proxy/root_context.py
diff --git a/libmproxy/proxy/server.py b/mitmproxy/libmproxy/proxy/server.py
index d208cff5..d208cff5 100644
--- a/libmproxy/proxy/server.py
+++ b/mitmproxy/libmproxy/proxy/server.py
diff --git a/libmproxy/script/__init__.py b/mitmproxy/libmproxy/script/__init__.py
index 3ee19b04..3ee19b04 100644
--- a/libmproxy/script/__init__.py
+++ b/mitmproxy/libmproxy/script/__init__.py
diff --git a/libmproxy/script/concurrent.py b/mitmproxy/libmproxy/script/concurrent.py
index f0f5e3cd..f0f5e3cd 100644
--- a/libmproxy/script/concurrent.py
+++ b/mitmproxy/libmproxy/script/concurrent.py
diff --git a/libmproxy/script/reloader.py b/mitmproxy/libmproxy/script/reloader.py
index b4acf51b..b4acf51b 100644
--- a/libmproxy/script/reloader.py
+++ b/mitmproxy/libmproxy/script/reloader.py
diff --git a/libmproxy/script/script.py b/mitmproxy/libmproxy/script/script.py
index 55778851..55778851 100644
--- a/libmproxy/script/script.py
+++ b/mitmproxy/libmproxy/script/script.py
diff --git a/libmproxy/script/script_context.py b/mitmproxy/libmproxy/script/script_context.py
index cd5d4b61..cd5d4b61 100644
--- a/libmproxy/script/script_context.py
+++ b/mitmproxy/libmproxy/script/script_context.py
diff --git a/libmproxy/stateobject.py b/mitmproxy/libmproxy/stateobject.py
index a4a1ffda..a4a1ffda 100644
--- a/libmproxy/stateobject.py
+++ b/mitmproxy/libmproxy/stateobject.py
diff --git a/libmproxy/tnetstring.py b/mitmproxy/libmproxy/tnetstring.py
index c5c185c6..c5c185c6 100644
--- a/libmproxy/tnetstring.py
+++ b/mitmproxy/libmproxy/tnetstring.py
diff --git a/libmproxy/utils.py b/mitmproxy/libmproxy/utils.py
index a697a637..a697a637 100644
--- a/libmproxy/utils.py
+++ b/mitmproxy/libmproxy/utils.py
diff --git a/libmproxy/version.py b/mitmproxy/libmproxy/version.py
index 664c2b28..664c2b28 100644
--- a/libmproxy/version.py
+++ b/mitmproxy/libmproxy/version.py
diff --git a/libmproxy/web/__init__.py b/mitmproxy/libmproxy/web/__init__.py
index 50c49e8d..50c49e8d 100644
--- a/libmproxy/web/__init__.py
+++ b/mitmproxy/libmproxy/web/__init__.py
diff --git a/libmproxy/web/app.py b/mitmproxy/libmproxy/web/app.py
index 63b7bf1a..63b7bf1a 100644
--- a/libmproxy/web/app.py
+++ b/mitmproxy/libmproxy/web/app.py
diff --git a/libmproxy/web/static/app.css b/mitmproxy/libmproxy/web/static/app.css
index 94a6abf0..94a6abf0 100644
--- a/libmproxy/web/static/app.css
+++ b/mitmproxy/libmproxy/web/static/app.css
diff --git a/libmproxy/web/static/app.js b/mitmproxy/libmproxy/web/static/app.js
index 27f356f7..27f356f7 100644
--- a/libmproxy/web/static/app.js
+++ b/mitmproxy/libmproxy/web/static/app.js
diff --git a/libmproxy/web/static/fonts/fontawesome-webfont.eot b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.eot
index 84677bc0..84677bc0 100644
--- a/libmproxy/web/static/fonts/fontawesome-webfont.eot
+++ b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.eot
diff --git a/libmproxy/web/static/fonts/fontawesome-webfont.svg b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.svg
index d907b25a..d907b25a 100644
--- a/libmproxy/web/static/fonts/fontawesome-webfont.svg
+++ b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.svg
diff --git a/libmproxy/web/static/fonts/fontawesome-webfont.ttf b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.ttf
index 96a3639c..96a3639c 100644
--- a/libmproxy/web/static/fonts/fontawesome-webfont.ttf
+++ b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.ttf
diff --git a/libmproxy/web/static/fonts/fontawesome-webfont.woff b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.woff
index 628b6a52..628b6a52 100644
--- a/libmproxy/web/static/fonts/fontawesome-webfont.woff
+++ b/mitmproxy/libmproxy/web/static/fonts/fontawesome-webfont.woff
diff --git a/libmproxy/web/static/images/chrome-devtools/LICENSE b/mitmproxy/libmproxy/web/static/images/chrome-devtools/LICENSE
index 6e4f8b9f..6e4f8b9f 100644
--- a/libmproxy/web/static/images/chrome-devtools/LICENSE
+++ b/mitmproxy/libmproxy/web/static/images/chrome-devtools/LICENSE
diff --git a/libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png
index 18828d06..18828d06 100644
--- a/libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceCSSIcon.png
diff --git a/libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png
index fdc10e47..fdc10e47 100644
--- a/libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceDocumentIcon.png
diff --git a/libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png
index c1b72189..c1b72189 100644
--- a/libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourceJSIcon.png
diff --git a/libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png
index 8c82a4c7..8c82a4c7 100644
--- a/libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/chrome-devtools/resourcePlainIcon.png
diff --git a/libmproxy/web/static/images/resourceExecutableIcon.png b/mitmproxy/libmproxy/web/static/images/resourceExecutableIcon.png
index fa70c2fd..fa70c2fd 100644
--- a/libmproxy/web/static/images/resourceExecutableIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/resourceExecutableIcon.png
diff --git a/libmproxy/web/static/images/resourceFlashIcon.png b/mitmproxy/libmproxy/web/static/images/resourceFlashIcon.png
index ead5a4d0..ead5a4d0 100644
--- a/libmproxy/web/static/images/resourceFlashIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/resourceFlashIcon.png
diff --git a/libmproxy/web/static/images/resourceImageIcon.png b/mitmproxy/libmproxy/web/static/images/resourceImageIcon.png
index 23163042..23163042 100644
--- a/libmproxy/web/static/images/resourceImageIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/resourceImageIcon.png
diff --git a/libmproxy/web/static/images/resourceJavaIcon.png b/mitmproxy/libmproxy/web/static/images/resourceJavaIcon.png
index 553b3391..553b3391 100644
--- a/libmproxy/web/static/images/resourceJavaIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/resourceJavaIcon.png
diff --git a/libmproxy/web/static/images/resourceNotModifiedIcon.png b/mitmproxy/libmproxy/web/static/images/resourceNotModifiedIcon.png
index 9c6a879d..9c6a879d 100644
--- a/libmproxy/web/static/images/resourceNotModifiedIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/resourceNotModifiedIcon.png
diff --git a/libmproxy/web/static/images/resourceRedirectIcon.png b/mitmproxy/libmproxy/web/static/images/resourceRedirectIcon.png
index 58fe3ac1..58fe3ac1 100644
--- a/libmproxy/web/static/images/resourceRedirectIcon.png
+++ b/mitmproxy/libmproxy/web/static/images/resourceRedirectIcon.png
diff --git a/libmproxy/web/static/vendor.css b/mitmproxy/libmproxy/web/static/vendor.css
index 4ed1f0b8..4ed1f0b8 100644
--- a/libmproxy/web/static/vendor.css
+++ b/mitmproxy/libmproxy/web/static/vendor.css
diff --git a/libmproxy/web/static/vendor.js b/mitmproxy/libmproxy/web/static/vendor.js
index 59d10445..59d10445 100644
--- a/libmproxy/web/static/vendor.js
+++ b/mitmproxy/libmproxy/web/static/vendor.js
diff --git a/libmproxy/web/templates/index.html b/mitmproxy/libmproxy/web/templates/index.html
index 5f2c6d5e..5f2c6d5e 100644
--- a/libmproxy/web/templates/index.html
+++ b/mitmproxy/libmproxy/web/templates/index.html
diff --git a/libmproxy/webfonts/fontawesome-webfont.eot b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.eot
index 84677bc0..84677bc0 100644
--- a/libmproxy/webfonts/fontawesome-webfont.eot
+++ b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.eot
diff --git a/libmproxy/webfonts/fontawesome-webfont.svg b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.svg
index d907b25a..d907b25a 100644
--- a/libmproxy/webfonts/fontawesome-webfont.svg
+++ b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.svg
diff --git a/libmproxy/webfonts/fontawesome-webfont.ttf b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.ttf
index 96a3639c..96a3639c 100644
--- a/libmproxy/webfonts/fontawesome-webfont.ttf
+++ b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.ttf
diff --git a/libmproxy/webfonts/fontawesome-webfont.woff b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.woff
index 628b6a52..628b6a52 100644
--- a/libmproxy/webfonts/fontawesome-webfont.woff
+++ b/mitmproxy/libmproxy/webfonts/fontawesome-webfont.woff
diff --git a/mitmdump b/mitmproxy/mitmdump
index 16087f61..16087f61 100755..100644
--- a/mitmdump
+++ b/mitmproxy/mitmdump
diff --git a/mitmproxy b/mitmproxy/mitmproxy
index b7c5c94e..b7c5c94e 100755..100644
--- a/mitmproxy
+++ b/mitmproxy/mitmproxy
diff --git a/mitmweb b/mitmproxy/mitmweb
index d709811b..d709811b 100755..100644
--- a/mitmweb
+++ b/mitmproxy/mitmweb
diff --git a/release/mitmdump.spec b/mitmproxy/release/mitmdump.spec
index c3b5ecd0..c3b5ecd0 100644
--- a/release/mitmdump.spec
+++ b/mitmproxy/release/mitmdump.spec
diff --git a/release/mitmproxy.spec b/mitmproxy/release/mitmproxy.spec
index 2666828a..2666828a 100644
--- a/release/mitmproxy.spec
+++ b/mitmproxy/release/mitmproxy.spec
diff --git a/release/mitmweb.spec b/mitmproxy/release/mitmweb.spec
index e1fea1a3..e1fea1a3 100644
--- a/release/mitmweb.spec
+++ b/mitmproxy/release/mitmweb.spec
diff --git a/requirements.txt b/mitmproxy/requirements.txt
index 49f86b9a..49f86b9a 100644
--- a/requirements.txt
+++ b/mitmproxy/requirements.txt
diff --git a/setup.cfg b/mitmproxy/setup.cfg
index 1151288f..1151288f 100644
--- a/setup.cfg
+++ b/mitmproxy/setup.cfg
diff --git a/setup.py b/mitmproxy/setup.py
index 52c7e6be..52c7e6be 100644
--- a/setup.py
+++ b/mitmproxy/setup.py
diff --git a/test/__init__.py b/mitmproxy/test/__init__.py
index 61d03152..61d03152 100644
--- a/test/__init__.py
+++ b/mitmproxy/test/__init__.py
diff --git a/test/completion/aaa b/mitmproxy/test/completion/aaa
index e69de29b..e69de29b 100644
--- a/test/completion/aaa
+++ b/mitmproxy/test/completion/aaa
diff --git a/test/completion/aab b/mitmproxy/test/completion/aab
index e69de29b..e69de29b 100644
--- a/test/completion/aab
+++ b/mitmproxy/test/completion/aab
diff --git a/test/completion/aac b/mitmproxy/test/completion/aac
index e69de29b..e69de29b 100644
--- a/test/completion/aac
+++ b/mitmproxy/test/completion/aac
diff --git a/test/data/1.css b/mitmproxy/test/data/1.css
index 33387ca7..33387ca7 100644
--- a/test/data/1.css
+++ b/mitmproxy/test/data/1.css
diff --git a/test/data/amf01 b/mitmproxy/test/data/amf01
index c8fc261d..c8fc261d 100644
--- a/test/data/amf01
+++ b/mitmproxy/test/data/amf01
diff --git a/test/data/amf02 b/mitmproxy/test/data/amf02
index ba69f130..ba69f130 100644
--- a/test/data/amf02
+++ b/mitmproxy/test/data/amf02
diff --git a/test/data/amf03 b/mitmproxy/test/data/amf03
index d9fa736a..d9fa736a 100644
--- a/test/data/amf03
+++ b/mitmproxy/test/data/amf03
diff --git a/test/data/clientcert/.gitignore b/mitmproxy/test/data/clientcert/.gitignore
index 07bc53d2..07bc53d2 100644
--- a/test/data/clientcert/.gitignore
+++ b/mitmproxy/test/data/clientcert/.gitignore
diff --git a/test/data/clientcert/127.0.0.1.pem b/mitmproxy/test/data/clientcert/127.0.0.1.pem
index d7093b76..d7093b76 100644
--- a/test/data/clientcert/127.0.0.1.pem
+++ b/mitmproxy/test/data/clientcert/127.0.0.1.pem
diff --git a/test/data/clientcert/client.cnf b/mitmproxy/test/data/clientcert/client.cnf
index 5046a944..5046a944 100644
--- a/test/data/clientcert/client.cnf
+++ b/mitmproxy/test/data/clientcert/client.cnf
diff --git a/test/data/clientcert/client.pem b/mitmproxy/test/data/clientcert/client.pem
index 322e07e0..322e07e0 100644
--- a/test/data/clientcert/client.pem
+++ b/mitmproxy/test/data/clientcert/client.pem
diff --git a/test/data/clientcert/make b/mitmproxy/test/data/clientcert/make
index e829952d..e829952d 100755..100644
--- a/test/data/clientcert/make
+++ b/mitmproxy/test/data/clientcert/make
diff --git a/test/data/confdir/mitmproxy-ca-cert.cer b/mitmproxy/test/data/confdir/mitmproxy-ca-cert.cer
index cc7f8f19..cc7f8f19 100644
--- a/test/data/confdir/mitmproxy-ca-cert.cer
+++ b/mitmproxy/test/data/confdir/mitmproxy-ca-cert.cer
diff --git a/test/data/confdir/mitmproxy-ca-cert.p12 b/mitmproxy/test/data/confdir/mitmproxy-ca-cert.p12
index d4cec0d4..d4cec0d4 100644
--- a/test/data/confdir/mitmproxy-ca-cert.p12
+++ b/mitmproxy/test/data/confdir/mitmproxy-ca-cert.p12
diff --git a/test/data/confdir/mitmproxy-ca-cert.pem b/mitmproxy/test/data/confdir/mitmproxy-ca-cert.pem
index cc7f8f19..cc7f8f19 100644
--- a/test/data/confdir/mitmproxy-ca-cert.pem
+++ b/mitmproxy/test/data/confdir/mitmproxy-ca-cert.pem
diff --git a/test/data/confdir/mitmproxy-ca.pem b/mitmproxy/test/data/confdir/mitmproxy-ca.pem
index 2a2343a6..2a2343a6 100644
--- a/test/data/confdir/mitmproxy-ca.pem
+++ b/mitmproxy/test/data/confdir/mitmproxy-ca.pem
diff --git a/test/data/dercert b/mitmproxy/test/data/dercert
index 370252af..370252af 100644
--- a/test/data/dercert
+++ b/mitmproxy/test/data/dercert
diff --git a/test/data/dumpfile-012 b/mitmproxy/test/data/dumpfile-012
index 49c2350d..49c2350d 100644
--- a/test/data/dumpfile-012
+++ b/mitmproxy/test/data/dumpfile-012
diff --git a/test/data/dumpfile-013 b/mitmproxy/test/data/dumpfile-013
index ede06f23..ede06f23 100644
--- a/test/data/dumpfile-013
+++ b/mitmproxy/test/data/dumpfile-013
diff --git a/test/data/htpasswd b/mitmproxy/test/data/htpasswd
index 54c95b8c..54c95b8c 100644
--- a/test/data/htpasswd
+++ b/mitmproxy/test/data/htpasswd
diff --git a/test/data/htpasswd.invalid b/mitmproxy/test/data/htpasswd.invalid
index 257cc564..257cc564 100644
--- a/test/data/htpasswd.invalid
+++ b/mitmproxy/test/data/htpasswd.invalid
diff --git a/test/data/image-err1.jpg b/mitmproxy/test/data/image-err1.jpg
index 1b251e6e..1b251e6e 100644
--- a/test/data/image-err1.jpg
+++ b/mitmproxy/test/data/image-err1.jpg
diff --git a/test/data/image.gif b/mitmproxy/test/data/image.gif
index 91c53284..91c53284 100644
--- a/test/data/image.gif
+++ b/mitmproxy/test/data/image.gif
diff --git a/test/data/image.ico b/mitmproxy/test/data/image.ico
index 4a8421dc..4a8421dc 100644
--- a/test/data/image.ico
+++ b/mitmproxy/test/data/image.ico
diff --git a/test/data/image.jpg b/mitmproxy/test/data/image.jpg
index 6cbe081e..6cbe081e 100644
--- a/test/data/image.jpg
+++ b/mitmproxy/test/data/image.jpg
diff --git a/test/data/image.png b/mitmproxy/test/data/image.png
index 33143e77..33143e77 100644
--- a/test/data/image.png
+++ b/mitmproxy/test/data/image.png
diff --git a/test/data/no_common_name.pem b/mitmproxy/test/data/no_common_name.pem
index fc271a0e..fc271a0e 100644
--- a/test/data/no_common_name.pem
+++ b/mitmproxy/test/data/no_common_name.pem
diff --git a/test/data/pf01 b/mitmproxy/test/data/pf01
index 3139a289..3139a289 100644
--- a/test/data/pf01
+++ b/mitmproxy/test/data/pf01
diff --git a/test/data/pf02 b/mitmproxy/test/data/pf02
index e4dc18b3..e4dc18b3 100644
--- a/test/data/pf02
+++ b/mitmproxy/test/data/pf02
diff --git a/test/data/protobuf01 b/mitmproxy/test/data/protobuf01
index fbfdbff3..fbfdbff3 100644
--- a/test/data/protobuf01
+++ b/mitmproxy/test/data/protobuf01
diff --git a/test/data/replace b/mitmproxy/test/data/replace
index ad8e760a..ad8e760a 100644
--- a/test/data/replace
+++ b/mitmproxy/test/data/replace
diff --git a/test/data/testkey.pem b/mitmproxy/test/data/testkey.pem
index af8d9d8f..af8d9d8f 100644
--- a/test/data/testkey.pem
+++ b/mitmproxy/test/data/testkey.pem
diff --git a/test/data/trusted-cadir/8117bdb9.0 b/mitmproxy/test/data/trusted-cadir/8117bdb9.0
index ae78b546..ae78b546 100644
--- a/test/data/trusted-cadir/8117bdb9.0
+++ b/mitmproxy/test/data/trusted-cadir/8117bdb9.0
diff --git a/test/data/trusted-cadir/9d45e6a9.0 b/mitmproxy/test/data/trusted-cadir/9d45e6a9.0
index ae78b546..ae78b546 100644
--- a/test/data/trusted-cadir/9d45e6a9.0
+++ b/mitmproxy/test/data/trusted-cadir/9d45e6a9.0
diff --git a/test/data/trusted-cadir/trusted-ca.pem b/mitmproxy/test/data/trusted-cadir/trusted-ca.pem
index ae78b546..ae78b546 100644
--- a/test/data/trusted-cadir/trusted-ca.pem
+++ b/mitmproxy/test/data/trusted-cadir/trusted-ca.pem
diff --git a/test/data/trusted-server.crt b/mitmproxy/test/data/trusted-server.crt
index 76f8559a..76f8559a 100644
--- a/test/data/trusted-server.crt
+++ b/mitmproxy/test/data/trusted-server.crt
diff --git a/test/data/untrusted-server.crt b/mitmproxy/test/data/untrusted-server.crt
index 62e58601..62e58601 100644
--- a/test/data/untrusted-server.crt
+++ b/mitmproxy/test/data/untrusted-server.crt
diff --git a/test/fuzzing/.env b/mitmproxy/test/fuzzing/.env
index 82ae6a8d..82ae6a8d 100644
--- a/test/fuzzing/.env
+++ b/mitmproxy/test/fuzzing/.env
diff --git a/test/fuzzing/README b/mitmproxy/test/fuzzing/README
index 2760506f..2760506f 100644
--- a/test/fuzzing/README
+++ b/mitmproxy/test/fuzzing/README
diff --git a/test/fuzzing/client_patterns b/mitmproxy/test/fuzzing/client_patterns
index 83457b6f..83457b6f 100644
--- a/test/fuzzing/client_patterns
+++ b/mitmproxy/test/fuzzing/client_patterns
diff --git a/test/fuzzing/go_proxy b/mitmproxy/test/fuzzing/go_proxy
index ea29400f..ea29400f 100755..100644
--- a/test/fuzzing/go_proxy
+++ b/mitmproxy/test/fuzzing/go_proxy
diff --git a/test/fuzzing/reverse_patterns b/mitmproxy/test/fuzzing/reverse_patterns
index 8d1d76a2..8d1d76a2 100644
--- a/test/fuzzing/reverse_patterns
+++ b/mitmproxy/test/fuzzing/reverse_patterns
diff --git a/test/fuzzing/straight_stream b/mitmproxy/test/fuzzing/straight_stream
index 41e2a6e1..41e2a6e1 100644
--- a/test/fuzzing/straight_stream
+++ b/mitmproxy/test/fuzzing/straight_stream
diff --git a/test/fuzzing/straight_stream_patterns b/mitmproxy/test/fuzzing/straight_stream_patterns
index 93a066e6..93a066e6 100644
--- a/test/fuzzing/straight_stream_patterns
+++ b/mitmproxy/test/fuzzing/straight_stream_patterns
diff --git a/test/fuzzing/straight_stream_ssl b/mitmproxy/test/fuzzing/straight_stream_ssl
index 708ff0b3..708ff0b3 100644
--- a/test/fuzzing/straight_stream_ssl
+++ b/mitmproxy/test/fuzzing/straight_stream_ssl
diff --git a/test/mock_urwid.py b/mitmproxy/test/mock_urwid.py
index 191210bf..191210bf 100644
--- a/test/mock_urwid.py
+++ b/mitmproxy/test/mock_urwid.py
diff --git a/test/scripts/a.py b/mitmproxy/test/scripts/a.py
index d4272ac8..d4272ac8 100644
--- a/test/scripts/a.py
+++ b/mitmproxy/test/scripts/a.py
diff --git a/test/scripts/a_helper.py b/mitmproxy/test/scripts/a_helper.py
index e1f1c649..e1f1c649 100644
--- a/test/scripts/a_helper.py
+++ b/mitmproxy/test/scripts/a_helper.py
diff --git a/test/scripts/all.py b/mitmproxy/test/scripts/all.py
index dad2aade..dad2aade 100644
--- a/test/scripts/all.py
+++ b/mitmproxy/test/scripts/all.py
diff --git a/test/scripts/concurrent_decorator.py b/mitmproxy/test/scripts/concurrent_decorator.py
index f6feda1d..f6feda1d 100644
--- a/test/scripts/concurrent_decorator.py
+++ b/mitmproxy/test/scripts/concurrent_decorator.py
diff --git a/test/scripts/concurrent_decorator_err.py b/mitmproxy/test/scripts/concurrent_decorator_err.py
index 00fd8dad..00fd8dad 100644
--- a/test/scripts/concurrent_decorator_err.py
+++ b/mitmproxy/test/scripts/concurrent_decorator_err.py
diff --git a/test/scripts/duplicate_flow.py b/mitmproxy/test/scripts/duplicate_flow.py
index e13af786..e13af786 100644
--- a/test/scripts/duplicate_flow.py
+++ b/mitmproxy/test/scripts/duplicate_flow.py
diff --git a/test/scripts/loaderr.py b/mitmproxy/test/scripts/loaderr.py
index 8dc4d56d..8dc4d56d 100644
--- a/test/scripts/loaderr.py
+++ b/mitmproxy/test/scripts/loaderr.py
diff --git a/test/scripts/reqerr.py b/mitmproxy/test/scripts/reqerr.py
index e7c503a8..e7c503a8 100644
--- a/test/scripts/reqerr.py
+++ b/mitmproxy/test/scripts/reqerr.py
diff --git a/test/scripts/starterr.py b/mitmproxy/test/scripts/starterr.py
index b217bdfe..b217bdfe 100644
--- a/test/scripts/starterr.py
+++ b/mitmproxy/test/scripts/starterr.py
diff --git a/test/scripts/stream_modify.py b/mitmproxy/test/scripts/stream_modify.py
index e26d83f1..e26d83f1 100644
--- a/test/scripts/stream_modify.py
+++ b/mitmproxy/test/scripts/stream_modify.py
diff --git a/test/scripts/syntaxerr.py b/mitmproxy/test/scripts/syntaxerr.py
index 219d6b84..219d6b84 100644
--- a/test/scripts/syntaxerr.py
+++ b/mitmproxy/test/scripts/syntaxerr.py
diff --git a/test/scripts/tcp_stream_modify.py b/mitmproxy/test/scripts/tcp_stream_modify.py
index 93b0d5c8..93b0d5c8 100644
--- a/test/scripts/tcp_stream_modify.py
+++ b/mitmproxy/test/scripts/tcp_stream_modify.py
diff --git a/test/scripts/unloaderr.py b/mitmproxy/test/scripts/unloaderr.py
index fba02734..fba02734 100644
--- a/test/scripts/unloaderr.py
+++ b/mitmproxy/test/scripts/unloaderr.py
diff --git a/test/test_app.py b/mitmproxy/test/test_app.py
index 577a70a5..577a70a5 100644
--- a/test/test_app.py
+++ b/mitmproxy/test/test_app.py
diff --git a/test/test_cmdline.py b/mitmproxy/test/test_cmdline.py
index 9b3317aa..9b3317aa 100644
--- a/test/test_cmdline.py
+++ b/mitmproxy/test/test_cmdline.py
diff --git a/test/test_console.py b/mitmproxy/test/test_console.py
index e64ed44a..e64ed44a 100644
--- a/test/test_console.py
+++ b/mitmproxy/test/test_console.py
diff --git a/test/test_console_common.py b/mitmproxy/test/test_console_common.py
index deba5f6c..deba5f6c 100644
--- a/test/test_console_common.py
+++ b/mitmproxy/test/test_console_common.py
diff --git a/test/test_console_help.py b/mitmproxy/test/test_console_help.py
index f1a71faf..f1a71faf 100644
--- a/test/test_console_help.py
+++ b/mitmproxy/test/test_console_help.py
diff --git a/test/test_console_palettes.py b/mitmproxy/test/test_console_palettes.py
index ac33f83d..ac33f83d 100644
--- a/test/test_console_palettes.py
+++ b/mitmproxy/test/test_console_palettes.py
diff --git a/test/test_console_pathedit.py b/mitmproxy/test/test_console_pathedit.py
index 940351f5..940351f5 100644
--- a/test/test_console_pathedit.py
+++ b/mitmproxy/test/test_console_pathedit.py
diff --git a/test/test_contentview.py b/mitmproxy/test/test_contentview.py
index af80d63a..af80d63a 100644
--- a/test/test_contentview.py
+++ b/mitmproxy/test/test_contentview.py
diff --git a/test/test_controller.py b/mitmproxy/test/test_controller.py
index ffc7d433..ffc7d433 100644
--- a/test/test_controller.py
+++ b/mitmproxy/test/test_controller.py
diff --git a/test/test_custom_contentview.py b/mitmproxy/test/test_custom_contentview.py
index adc4109b..adc4109b 100644
--- a/test/test_custom_contentview.py
+++ b/mitmproxy/test/test_custom_contentview.py
diff --git a/test/test_dump.py b/mitmproxy/test/test_dump.py
index dbd0c653..dbd0c653 100644
--- a/test/test_dump.py
+++ b/mitmproxy/test/test_dump.py
diff --git a/test/test_examples.py b/mitmproxy/test/test_examples.py
index bb7c596b..bb7c596b 100644
--- a/test/test_examples.py
+++ b/mitmproxy/test/test_examples.py
diff --git a/test/test_filt.py b/mitmproxy/test/test_filt.py
index e6873c7d..e6873c7d 100644
--- a/test/test_filt.py
+++ b/mitmproxy/test/test_filt.py
diff --git a/test/test_flow.py b/mitmproxy/test/test_flow.py
index b122489f..b122489f 100644
--- a/test/test_flow.py
+++ b/mitmproxy/test/test_flow.py
diff --git a/test/test_flow_export.py b/mitmproxy/test/test_flow_export.py
index e5e9c0a3..e5e9c0a3 100644
--- a/test/test_flow_export.py
+++ b/mitmproxy/test/test_flow_export.py
diff --git a/test/test_flow_format_compat.py b/mitmproxy/test/test_flow_format_compat.py
index 232f5473..232f5473 100644
--- a/test/test_flow_format_compat.py
+++ b/mitmproxy/test/test_flow_format_compat.py
diff --git a/test/test_fuzzing.py b/mitmproxy/test/test_fuzzing.py
index cec64f58..cec64f58 100644
--- a/test/test_fuzzing.py
+++ b/mitmproxy/test/test_fuzzing.py
diff --git a/test/test_platform_pf.py b/mitmproxy/test/test_platform_pf.py
index 8994ee0d..8994ee0d 100644
--- a/test/test_platform_pf.py
+++ b/mitmproxy/test/test_platform_pf.py
diff --git a/test/test_protocol_http1.py b/mitmproxy/test/test_protocol_http1.py
index 13e0eabe..13e0eabe 100644
--- a/test/test_protocol_http1.py
+++ b/mitmproxy/test/test_protocol_http1.py
diff --git a/test/test_protocol_http2.py b/mitmproxy/test/test_protocol_http2.py
index c2c736af..c2c736af 100644
--- a/test/test_protocol_http2.py
+++ b/mitmproxy/test/test_protocol_http2.py
diff --git a/test/test_proxy.py b/mitmproxy/test/test_proxy.py
index 27ae70a8..27ae70a8 100644
--- a/test/test_proxy.py
+++ b/mitmproxy/test/test_proxy.py
diff --git a/test/test_script.py b/mitmproxy/test/test_script.py
index f3a6499e..f3a6499e 100644
--- a/test/test_script.py
+++ b/mitmproxy/test/test_script.py
diff --git a/test/test_server.py b/mitmproxy/test/test_server.py
index 1b7e6966..1b7e6966 100644
--- a/test/test_server.py
+++ b/mitmproxy/test/test_server.py
diff --git a/test/test_utils.py b/mitmproxy/test/test_utils.py
index 17bf3dbf..17bf3dbf 100644
--- a/test/test_utils.py
+++ b/mitmproxy/test/test_utils.py
diff --git a/test/tools/1024example b/mitmproxy/test/tools/1024example
index 78af7ed0..78af7ed0 100644
--- a/test/tools/1024example
+++ b/mitmproxy/test/tools/1024example
diff --git a/test/tools/ab.exe b/mitmproxy/test/tools/ab.exe
index d68ed0f3..d68ed0f3 100644
--- a/test/tools/ab.exe
+++ b/mitmproxy/test/tools/ab.exe
diff --git a/test/tools/bench.py b/mitmproxy/test/tools/bench.py
index 8127d083..8127d083 100644
--- a/test/tools/bench.py
+++ b/mitmproxy/test/tools/bench.py
diff --git a/test/tools/benchtool.py b/mitmproxy/test/tools/benchtool.py
index a1d80697..a1d80697 100644
--- a/test/tools/benchtool.py
+++ b/mitmproxy/test/tools/benchtool.py
diff --git a/test/tools/getcert b/mitmproxy/test/tools/getcert
index 3bd2bec8..3bd2bec8 100755..100644
--- a/test/tools/getcert
+++ b/mitmproxy/test/tools/getcert
diff --git a/test/tools/inspect_dumpfile.py b/mitmproxy/test/tools/inspect_dumpfile.py
index d15e9e8a..d15e9e8a 100644
--- a/test/tools/inspect_dumpfile.py
+++ b/mitmproxy/test/tools/inspect_dumpfile.py
diff --git a/test/tools/memoryleak.py b/mitmproxy/test/tools/memoryleak.py
index 259309a6..259309a6 100644
--- a/test/tools/memoryleak.py
+++ b/mitmproxy/test/tools/memoryleak.py
diff --git a/test/tools/passive_close.py b/mitmproxy/test/tools/passive_close.py
index 5b1bd451..5b1bd451 100644
--- a/test/tools/passive_close.py
+++ b/mitmproxy/test/tools/passive_close.py
diff --git a/test/tools/testpatt b/mitmproxy/test/tools/testpatt
index b41011c0..b41011c0 100755..100644
--- a/test/tools/testpatt
+++ b/mitmproxy/test/tools/testpatt
diff --git a/test/tservers.py b/mitmproxy/test/tservers.py
index dbc9f7d0..dbc9f7d0 100644
--- a/test/tservers.py
+++ b/mitmproxy/test/tservers.py
diff --git a/test/tutils.py b/mitmproxy/test/tutils.py
index 2ce0884d..2ce0884d 100644
--- a/test/tutils.py
+++ b/mitmproxy/test/tutils.py
diff --git a/web/.bowerrc b/mitmproxy/web/.bowerrc
index 5e6701af..5e6701af 100644
--- a/web/.bowerrc
+++ b/mitmproxy/web/.bowerrc
diff --git a/web/.eslintrc b/mitmproxy/web/.eslintrc
index df187739..df187739 100644
--- a/web/.eslintrc
+++ b/mitmproxy/web/.eslintrc
diff --git a/web/README b/mitmproxy/web/README
index 63c3e6e0..63c3e6e0 100644
--- a/web/README
+++ b/mitmproxy/web/README
diff --git a/web/conf.js b/mitmproxy/web/conf.js
index 7c520973..7c520973 100644
--- a/web/conf.js
+++ b/mitmproxy/web/conf.js
diff --git a/web/gulpfile.js b/mitmproxy/web/gulpfile.js
index 83893c91..83893c91 100644
--- a/web/gulpfile.js
+++ b/mitmproxy/web/gulpfile.js
diff --git a/web/package.json b/mitmproxy/web/package.json
index 5bcbdd87..5bcbdd87 100644
--- a/web/package.json
+++ b/mitmproxy/web/package.json
diff --git a/web/src/css/app.less b/mitmproxy/web/src/css/app.less
index 046d378a..046d378a 100644
--- a/web/src/css/app.less
+++ b/mitmproxy/web/src/css/app.less
diff --git a/web/src/css/eventlog.less b/mitmproxy/web/src/css/eventlog.less
index 26dea3cc..26dea3cc 100644
--- a/web/src/css/eventlog.less
+++ b/mitmproxy/web/src/css/eventlog.less
diff --git a/web/src/css/flowdetail.less b/mitmproxy/web/src/css/flowdetail.less
index edf97566..edf97566 100644
--- a/web/src/css/flowdetail.less
+++ b/mitmproxy/web/src/css/flowdetail.less
diff --git a/web/src/css/flowtable.less b/mitmproxy/web/src/css/flowtable.less
index 3533983c..3533983c 100644
--- a/web/src/css/flowtable.less
+++ b/mitmproxy/web/src/css/flowtable.less
diff --git a/web/src/css/flowview.less b/mitmproxy/web/src/css/flowview.less
index aa8a2df2..aa8a2df2 100644
--- a/web/src/css/flowview.less
+++ b/mitmproxy/web/src/css/flowview.less
diff --git a/web/src/css/footer.less b/mitmproxy/web/src/css/footer.less
index c041a022..c041a022 100644
--- a/web/src/css/footer.less
+++ b/mitmproxy/web/src/css/footer.less
diff --git a/web/src/css/header.less b/mitmproxy/web/src/css/header.less
index 8fa5e37f..8fa5e37f 100644
--- a/web/src/css/header.less
+++ b/mitmproxy/web/src/css/header.less
diff --git a/web/src/css/layout.less b/mitmproxy/web/src/css/layout.less
index 1075d6c9..1075d6c9 100644
--- a/web/src/css/layout.less
+++ b/mitmproxy/web/src/css/layout.less
diff --git a/web/src/css/prompt.less b/mitmproxy/web/src/css/prompt.less
index eee0426d..eee0426d 100644
--- a/web/src/css/prompt.less
+++ b/mitmproxy/web/src/css/prompt.less
diff --git a/web/src/css/sprites.less b/mitmproxy/web/src/css/sprites.less
index 74131c5e..74131c5e 100644
--- a/web/src/css/sprites.less
+++ b/mitmproxy/web/src/css/sprites.less
diff --git a/web/src/css/tabs.less b/mitmproxy/web/src/css/tabs.less
index 43f7264e..43f7264e 100644
--- a/web/src/css/tabs.less
+++ b/mitmproxy/web/src/css/tabs.less
diff --git a/web/src/css/vendor-bootstrap-variables.less b/mitmproxy/web/src/css/vendor-bootstrap-variables.less
index e2c37bf5..e2c37bf5 100644
--- a/web/src/css/vendor-bootstrap-variables.less
+++ b/mitmproxy/web/src/css/vendor-bootstrap-variables.less
diff --git a/web/src/css/vendor-bootstrap.less b/mitmproxy/web/src/css/vendor-bootstrap.less
index 35fda379..35fda379 100644
--- a/web/src/css/vendor-bootstrap.less
+++ b/mitmproxy/web/src/css/vendor-bootstrap.less
diff --git a/web/src/css/vendor.less b/mitmproxy/web/src/css/vendor.less
index e91ae3a8..e91ae3a8 100644
--- a/web/src/css/vendor.less
+++ b/mitmproxy/web/src/css/vendor.less
diff --git a/web/src/fonts/FontAwesome.otf b/mitmproxy/web/src/fonts/FontAwesome.otf
index 81c9ad94..81c9ad94 100644
--- a/web/src/fonts/FontAwesome.otf
+++ b/mitmproxy/web/src/fonts/FontAwesome.otf
diff --git a/web/src/fonts/README b/mitmproxy/web/src/fonts/README
index 218a78e1..218a78e1 100644
--- a/web/src/fonts/README
+++ b/mitmproxy/web/src/fonts/README
diff --git a/web/src/fonts/font-awesome.css b/mitmproxy/web/src/fonts/font-awesome.css
index 9eb5d5b7..9eb5d5b7 100644
--- a/web/src/fonts/font-awesome.css
+++ b/mitmproxy/web/src/fonts/font-awesome.css
diff --git a/web/src/fonts/fontawesome-webfont.eot b/mitmproxy/web/src/fonts/fontawesome-webfont.eot
index 84677bc0..84677bc0 100644
--- a/web/src/fonts/fontawesome-webfont.eot
+++ b/mitmproxy/web/src/fonts/fontawesome-webfont.eot
diff --git a/web/src/fonts/fontawesome-webfont.svg b/mitmproxy/web/src/fonts/fontawesome-webfont.svg
index d907b25a..d907b25a 100644
--- a/web/src/fonts/fontawesome-webfont.svg
+++ b/mitmproxy/web/src/fonts/fontawesome-webfont.svg
diff --git a/web/src/fonts/fontawesome-webfont.ttf b/mitmproxy/web/src/fonts/fontawesome-webfont.ttf
index 96a3639c..96a3639c 100644
--- a/web/src/fonts/fontawesome-webfont.ttf
+++ b/mitmproxy/web/src/fonts/fontawesome-webfont.ttf
diff --git a/web/src/fonts/fontawesome-webfont.woff b/mitmproxy/web/src/fonts/fontawesome-webfont.woff
index 628b6a52..628b6a52 100644
--- a/web/src/fonts/fontawesome-webfont.woff
+++ b/mitmproxy/web/src/fonts/fontawesome-webfont.woff
diff --git a/web/src/images/chrome-devtools/LICENSE b/mitmproxy/web/src/images/chrome-devtools/LICENSE
index 6e4f8b9f..6e4f8b9f 100644
--- a/web/src/images/chrome-devtools/LICENSE
+++ b/mitmproxy/web/src/images/chrome-devtools/LICENSE
diff --git a/web/src/images/chrome-devtools/resourceCSSIcon.png b/mitmproxy/web/src/images/chrome-devtools/resourceCSSIcon.png
index 18828d06..18828d06 100644
--- a/web/src/images/chrome-devtools/resourceCSSIcon.png
+++ b/mitmproxy/web/src/images/chrome-devtools/resourceCSSIcon.png
diff --git a/web/src/images/chrome-devtools/resourceDocumentIcon.png b/mitmproxy/web/src/images/chrome-devtools/resourceDocumentIcon.png
index fdc10e47..fdc10e47 100644
--- a/web/src/images/chrome-devtools/resourceDocumentIcon.png
+++ b/mitmproxy/web/src/images/chrome-devtools/resourceDocumentIcon.png
diff --git a/web/src/images/chrome-devtools/resourceJSIcon.png b/mitmproxy/web/src/images/chrome-devtools/resourceJSIcon.png
index c1b72189..c1b72189 100644
--- a/web/src/images/chrome-devtools/resourceJSIcon.png
+++ b/mitmproxy/web/src/images/chrome-devtools/resourceJSIcon.png
diff --git a/web/src/images/chrome-devtools/resourcePlainIcon.png b/mitmproxy/web/src/images/chrome-devtools/resourcePlainIcon.png
index 8c82a4c7..8c82a4c7 100644
--- a/web/src/images/chrome-devtools/resourcePlainIcon.png
+++ b/mitmproxy/web/src/images/chrome-devtools/resourcePlainIcon.png
diff --git a/web/src/images/resourceExecutableIcon.png b/mitmproxy/web/src/images/resourceExecutableIcon.png
index fa70c2fd..fa70c2fd 100644
--- a/web/src/images/resourceExecutableIcon.png
+++ b/mitmproxy/web/src/images/resourceExecutableIcon.png
diff --git a/web/src/images/resourceFlashIcon.png b/mitmproxy/web/src/images/resourceFlashIcon.png
index ead5a4d0..ead5a4d0 100644
--- a/web/src/images/resourceFlashIcon.png
+++ b/mitmproxy/web/src/images/resourceFlashIcon.png
diff --git a/web/src/images/resourceImageIcon.png b/mitmproxy/web/src/images/resourceImageIcon.png
index 23163042..23163042 100644
--- a/web/src/images/resourceImageIcon.png
+++ b/mitmproxy/web/src/images/resourceImageIcon.png
diff --git a/web/src/images/resourceJavaIcon.png b/mitmproxy/web/src/images/resourceJavaIcon.png
index 553b3391..553b3391 100644
--- a/web/src/images/resourceJavaIcon.png
+++ b/mitmproxy/web/src/images/resourceJavaIcon.png
diff --git a/web/src/images/resourceNotModifiedIcon.png b/mitmproxy/web/src/images/resourceNotModifiedIcon.png
index 9c6a879d..9c6a879d 100644
--- a/web/src/images/resourceNotModifiedIcon.png
+++ b/mitmproxy/web/src/images/resourceNotModifiedIcon.png
diff --git a/web/src/images/resourceRedirectIcon.png b/mitmproxy/web/src/images/resourceRedirectIcon.png
index 58fe3ac1..58fe3ac1 100644
--- a/web/src/images/resourceRedirectIcon.png
+++ b/mitmproxy/web/src/images/resourceRedirectIcon.png
diff --git a/web/src/js/actions.js b/mitmproxy/web/src/js/actions.js
index 2455a52e..2455a52e 100644
--- a/web/src/js/actions.js
+++ b/mitmproxy/web/src/js/actions.js
diff --git a/web/src/js/app.js b/mitmproxy/web/src/js/app.js
index 9fb868b8..9fb868b8 100644
--- a/web/src/js/app.js
+++ b/mitmproxy/web/src/js/app.js
diff --git a/web/src/js/components/common.js b/mitmproxy/web/src/js/components/common.js
index 965ae9a7..965ae9a7 100644
--- a/web/src/js/components/common.js
+++ b/mitmproxy/web/src/js/components/common.js
diff --git a/web/src/js/components/editor.js b/mitmproxy/web/src/js/components/editor.js
index f2d44566..f2d44566 100644
--- a/web/src/js/components/editor.js
+++ b/mitmproxy/web/src/js/components/editor.js
diff --git a/web/src/js/components/eventlog.js b/mitmproxy/web/src/js/components/eventlog.js
index fea7b247..fea7b247 100644
--- a/web/src/js/components/eventlog.js
+++ b/mitmproxy/web/src/js/components/eventlog.js
diff --git a/web/src/js/components/flowtable-columns.js b/mitmproxy/web/src/js/components/flowtable-columns.js
index 74d96216..74d96216 100644
--- a/web/src/js/components/flowtable-columns.js
+++ b/mitmproxy/web/src/js/components/flowtable-columns.js
diff --git a/web/src/js/components/flowtable.js b/mitmproxy/web/src/js/components/flowtable.js
index 609034f6..609034f6 100644
--- a/web/src/js/components/flowtable.js
+++ b/mitmproxy/web/src/js/components/flowtable.js
diff --git a/web/src/js/components/flowview/contentview.js b/mitmproxy/web/src/js/components/flowview/contentview.js
index 63d22c1c..63d22c1c 100644
--- a/web/src/js/components/flowview/contentview.js
+++ b/mitmproxy/web/src/js/components/flowview/contentview.js
diff --git a/web/src/js/components/flowview/details.js b/mitmproxy/web/src/js/components/flowview/details.js
index 00e0116c..00e0116c 100644
--- a/web/src/js/components/flowview/details.js
+++ b/mitmproxy/web/src/js/components/flowview/details.js
diff --git a/web/src/js/components/flowview/index.js b/mitmproxy/web/src/js/components/flowview/index.js
index 739a46dc..739a46dc 100644
--- a/web/src/js/components/flowview/index.js
+++ b/mitmproxy/web/src/js/components/flowview/index.js
diff --git a/web/src/js/components/flowview/messages.js b/mitmproxy/web/src/js/components/flowview/messages.js
index 7ac95d85..7ac95d85 100644
--- a/web/src/js/components/flowview/messages.js
+++ b/mitmproxy/web/src/js/components/flowview/messages.js
diff --git a/web/src/js/components/flowview/nav.js b/mitmproxy/web/src/js/components/flowview/nav.js
index 46eda707..46eda707 100644
--- a/web/src/js/components/flowview/nav.js
+++ b/mitmproxy/web/src/js/components/flowview/nav.js
diff --git a/web/src/js/components/footer.js b/mitmproxy/web/src/js/components/footer.js
index 229d691b..229d691b 100644
--- a/web/src/js/components/footer.js
+++ b/mitmproxy/web/src/js/components/footer.js
diff --git a/web/src/js/components/header.js b/mitmproxy/web/src/js/components/header.js
index 998a41df..998a41df 100644
--- a/web/src/js/components/header.js
+++ b/mitmproxy/web/src/js/components/header.js
diff --git a/web/src/js/components/mainview.js b/mitmproxy/web/src/js/components/mainview.js
index 9ff51dfa..9ff51dfa 100644
--- a/web/src/js/components/mainview.js
+++ b/mitmproxy/web/src/js/components/mainview.js
diff --git a/web/src/js/components/prompt.js b/mitmproxy/web/src/js/components/prompt.js
index 121a1170..121a1170 100644
--- a/web/src/js/components/prompt.js
+++ b/mitmproxy/web/src/js/components/prompt.js
diff --git a/web/src/js/components/proxyapp.js b/mitmproxy/web/src/js/components/proxyapp.js
index e766d6e6..e766d6e6 100644
--- a/web/src/js/components/proxyapp.js
+++ b/mitmproxy/web/src/js/components/proxyapp.js
diff --git a/web/src/js/components/virtualscroll.js b/mitmproxy/web/src/js/components/virtualscroll.js
index 956e1a0b..956e1a0b 100644
--- a/web/src/js/components/virtualscroll.js
+++ b/mitmproxy/web/src/js/components/virtualscroll.js
diff --git a/web/src/js/connection.js b/mitmproxy/web/src/js/connection.js
index 5e229b6e..5e229b6e 100644
--- a/web/src/js/connection.js
+++ b/mitmproxy/web/src/js/connection.js
diff --git a/web/src/js/dispatcher.js b/mitmproxy/web/src/js/dispatcher.js
index 0c2aa202..0c2aa202 100644
--- a/web/src/js/dispatcher.js
+++ b/mitmproxy/web/src/js/dispatcher.js
diff --git a/web/src/js/filt/filt.js b/mitmproxy/web/src/js/filt/filt.js
index 45b42f3a..45b42f3a 100644
--- a/web/src/js/filt/filt.js
+++ b/mitmproxy/web/src/js/filt/filt.js
diff --git a/web/src/js/filt/filt.peg b/mitmproxy/web/src/js/filt/filt.peg
index 6f9bdac6..6f9bdac6 100644
--- a/web/src/js/filt/filt.peg
+++ b/mitmproxy/web/src/js/filt/filt.peg
diff --git a/web/src/js/flow/utils.js b/mitmproxy/web/src/js/flow/utils.js
index d72febaa..d72febaa 100644
--- a/web/src/js/flow/utils.js
+++ b/mitmproxy/web/src/js/flow/utils.js
diff --git a/web/src/js/store/store.js b/mitmproxy/web/src/js/store/store.js
index 5024049f..5024049f 100644
--- a/web/src/js/store/store.js
+++ b/mitmproxy/web/src/js/store/store.js
diff --git a/web/src/js/store/view.js b/mitmproxy/web/src/js/store/view.js
index d628d46b..d628d46b 100644
--- a/web/src/js/store/view.js
+++ b/mitmproxy/web/src/js/store/view.js
diff --git a/web/src/js/tests/utils.js b/mitmproxy/web/src/js/tests/utils.js
index dfbb9ba6..dfbb9ba6 100644
--- a/web/src/js/tests/utils.js
+++ b/mitmproxy/web/src/js/tests/utils.js
diff --git a/web/src/js/utils.js b/mitmproxy/web/src/js/utils.js
index 40575692..40575692 100644
--- a/web/src/js/utils.js
+++ b/mitmproxy/web/src/js/utils.js
diff --git a/web/src/templates/index.html b/mitmproxy/web/src/templates/index.html
index 5f2c6d5e..5f2c6d5e 100644
--- a/web/src/templates/index.html
+++ b/mitmproxy/web/src/templates/index.html