move mitmproxy

snemes · Feb 15, 2016 · 33fa492 · 33fa492
1 parent 36f34f7
commit 33fa492
Show file tree

Hide file tree

Showing 444 changed files with 0 additions and 0 deletions.
diff --git a/.appveyor.yml → mitmproxy/.appveyor.yml b/.appveyor.yml → mitmproxy/.appveyor.yml
diff --git a/.coveragerc → mitmproxy/.coveragerc b/.coveragerc → mitmproxy/.coveragerc
diff --git a/.dockerignore → mitmproxy/.dockerignore b/.dockerignore → mitmproxy/.dockerignore
diff --git a/.env → mitmproxy/.env b/.env → mitmproxy/.env
diff --git a/.gitattributes → mitmproxy/.gitattributes b/.gitattributes → mitmproxy/.gitattributes
diff --git a/.gitignore → mitmproxy/.gitignore b/.gitignore → mitmproxy/.gitignore
diff --git a/.landscape.yml → mitmproxy/.landscape.yml b/.landscape.yml → mitmproxy/.landscape.yml
diff --git a/.travis.yml → mitmproxy/.travis.yml b/.travis.yml → mitmproxy/.travis.yml
diff --git a/CHANGELOG → mitmproxy/CHANGELOG b/CHANGELOG → mitmproxy/CHANGELOG
diff --git a/CONTRIBUTING.md → mitmproxy/CONTRIBUTING.md b/CONTRIBUTING.md → mitmproxy/CONTRIBUTING.md
diff --git a/CONTRIBUTORS → mitmproxy/CONTRIBUTORS b/CONTRIBUTORS → mitmproxy/CONTRIBUTORS
diff --git a/Dockerfile → mitmproxy/Dockerfile b/Dockerfile → mitmproxy/Dockerfile
diff --git a/LICENSE → mitmproxy/LICENSE b/LICENSE → mitmproxy/LICENSE
diff --git a/MANIFEST.in → mitmproxy/MANIFEST.in b/MANIFEST.in → mitmproxy/MANIFEST.in
diff --git a/README.rst → mitmproxy/README.rst b/README.rst → mitmproxy/README.rst
diff --git a/dev → mitmproxy/dev b/dev → mitmproxy/dev
diff --git a/dev.bat → mitmproxy/dev.bat b/dev.bat → mitmproxy/dev.bat
diff --git a/docs/.gitignore → mitmproxy/docs/.gitignore b/docs/.gitignore → mitmproxy/docs/.gitignore
diff --git a/docs/Makefile → mitmproxy/docs/Makefile b/docs/Makefile → mitmproxy/docs/Makefile
diff --git a/docs/_templates/page.html → mitmproxy/docs/_templates/page.html b/docs/_templates/page.html → mitmproxy/docs/_templates/page.html
diff --git a/docs/certinstall-webapp.png → mitmproxy/docs/certinstall-webapp.png b/docs/certinstall-webapp.png → mitmproxy/docs/certinstall-webapp.png
diff --git a/docs/certinstall.rst → mitmproxy/docs/certinstall.rst b/docs/certinstall.rst → mitmproxy/docs/certinstall.rst
diff --git a/docs/conf.py → mitmproxy/docs/conf.py b/docs/conf.py → mitmproxy/docs/conf.py
diff --git a/docs/config.rst → mitmproxy/docs/config.rst b/docs/config.rst → mitmproxy/docs/config.rst
diff --git a/docs/custom-routing.txt → mitmproxy/docs/custom-routing.txt b/docs/custom-routing.txt → mitmproxy/docs/custom-routing.txt
diff --git a/docs/dev/addingviews.html → mitmproxy/docs/dev/addingviews.html b/docs/dev/addingviews.html → mitmproxy/docs/dev/addingviews.html
diff --git a/docs/dev/architecture.rst → mitmproxy/docs/dev/architecture.rst b/docs/dev/architecture.rst → mitmproxy/docs/dev/architecture.rst
diff --git a/docs/dev/exceptions.rst → mitmproxy/docs/dev/exceptions.rst b/docs/dev/exceptions.rst → mitmproxy/docs/dev/exceptions.rst
diff --git a/docs/dev/models.rst → mitmproxy/docs/dev/models.rst b/docs/dev/models.rst → mitmproxy/docs/dev/models.rst
diff --git a/docs/dev/protocols.rst → mitmproxy/docs/dev/protocols.rst b/docs/dev/protocols.rst → mitmproxy/docs/dev/protocols.rst
diff --git a/docs/dev/proxy.rst → mitmproxy/docs/dev/proxy.rst b/docs/dev/proxy.rst → mitmproxy/docs/dev/proxy.rst
diff --git a/docs/dev/sslkeylogfile.rst → mitmproxy/docs/dev/sslkeylogfile.rst b/docs/dev/sslkeylogfile.rst → mitmproxy/docs/dev/sslkeylogfile.rst
diff --git a/docs/dev/testing.rst → mitmproxy/docs/dev/testing.rst b/docs/dev/testing.rst → mitmproxy/docs/dev/testing.rst
diff --git a/docs/favicon.ico → mitmproxy/docs/favicon.ico b/docs/favicon.ico → mitmproxy/docs/favicon.ico
diff --git a/docs/features/anticache.rst → mitmproxy/docs/features/anticache.rst b/docs/features/anticache.rst → mitmproxy/docs/features/anticache.rst
diff --git a/docs/features/clientreplay.rst → mitmproxy/docs/features/clientreplay.rst b/docs/features/clientreplay.rst → mitmproxy/docs/features/clientreplay.rst
diff --git a/docs/features/filters.rst → mitmproxy/docs/features/filters.rst b/docs/features/filters.rst → mitmproxy/docs/features/filters.rst
diff --git a/docs/features/passthrough.rst → mitmproxy/docs/features/passthrough.rst b/docs/features/passthrough.rst → mitmproxy/docs/features/passthrough.rst
diff --git a/docs/features/proxyauth.rst → mitmproxy/docs/features/proxyauth.rst b/docs/features/proxyauth.rst → mitmproxy/docs/features/proxyauth.rst
diff --git a/docs/features/replacements.rst → mitmproxy/docs/features/replacements.rst b/docs/features/replacements.rst → mitmproxy/docs/features/replacements.rst
diff --git a/docs/features/responsestreaming.rst → ...proxy/docs/features/responsestreaming.rst b/docs/features/responsestreaming.rst → ...proxy/docs/features/responsestreaming.rst
diff --git a/docs/features/reverseproxy.rst → mitmproxy/docs/features/reverseproxy.rst b/docs/features/reverseproxy.rst → mitmproxy/docs/features/reverseproxy.rst
diff --git a/docs/features/serverreplay.rst → mitmproxy/docs/features/serverreplay.rst b/docs/features/serverreplay.rst → mitmproxy/docs/features/serverreplay.rst
diff --git a/docs/features/setheaders.rst → mitmproxy/docs/features/setheaders.rst b/docs/features/setheaders.rst → mitmproxy/docs/features/setheaders.rst
diff --git a/docs/features/socksproxy.rst → mitmproxy/docs/features/socksproxy.rst b/docs/features/socksproxy.rst → mitmproxy/docs/features/socksproxy.rst
diff --git a/docs/features/sticky.rst → mitmproxy/docs/features/sticky.rst b/docs/features/sticky.rst → mitmproxy/docs/features/sticky.rst
diff --git a/docs/features/tcpproxy.rst → mitmproxy/docs/features/tcpproxy.rst b/docs/features/tcpproxy.rst → mitmproxy/docs/features/tcpproxy.rst
diff --git a/docs/features/upstreamcerts.rst → mitmproxy/docs/features/upstreamcerts.rst b/docs/features/upstreamcerts.rst → mitmproxy/docs/features/upstreamcerts.rst
diff --git a/docs/features/upstreamproxy.rst → mitmproxy/docs/features/upstreamproxy.rst b/docs/features/upstreamproxy.rst → mitmproxy/docs/features/upstreamproxy.rst
diff --git a/docs/howmitmproxy.rst → mitmproxy/docs/howmitmproxy.rst b/docs/howmitmproxy.rst → mitmproxy/docs/howmitmproxy.rst
diff --git a/docs/index.rst → mitmproxy/docs/index.rst b/docs/index.rst → mitmproxy/docs/index.rst
diff --git a/docs/install.rst → mitmproxy/docs/install.rst b/docs/install.rst → mitmproxy/docs/install.rst
diff --git a/docs/introduction.rst → mitmproxy/docs/introduction.rst b/docs/introduction.rst → mitmproxy/docs/introduction.rst
diff --git a/docs/mitmdump.rst → mitmproxy/docs/mitmdump.rst b/docs/mitmdump.rst → mitmproxy/docs/mitmdump.rst
diff --git a/docs/mitmproxy-docs.png → mitmproxy/docs/mitmproxy-docs.png b/docs/mitmproxy-docs.png → mitmproxy/docs/mitmproxy-docs.png
diff --git a/docs/mitmproxy-long.png → mitmproxy/docs/mitmproxy-long.png b/docs/mitmproxy-long.png → mitmproxy/docs/mitmproxy-long.png
diff --git a/docs/mitmproxy.rst → mitmproxy/docs/mitmproxy.rst b/docs/mitmproxy.rst → mitmproxy/docs/mitmproxy.rst
diff --git a/docs/modes.rst → mitmproxy/docs/modes.rst b/docs/modes.rst → mitmproxy/docs/modes.rst
diff --git a/docs/schematics/_explicit.graffle/data.plist → ...s/schematics/_explicit.graffle/data.plist b/docs/schematics/_explicit.graffle/data.plist → ...s/schematics/_explicit.graffle/data.plist
diff --git a/.../schematics/_explicit.graffle/image3.icns → .../schematics/_explicit.graffle/image3.icns b/.../schematics/_explicit.graffle/image3.icns → .../schematics/_explicit.graffle/image3.icns
diff --git a/.../schematics/_explicit.graffle/image6.tiff → .../schematics/_explicit.graffle/image6.tiff b/.../schematics/_explicit.graffle/image6.tiff → .../schematics/_explicit.graffle/image6.tiff
diff --git a/...matics/_explicit_https.graffle/data.plist → ...matics/_explicit_https.graffle/data.plist b/...matics/_explicit_https.graffle/data.plist → ...matics/_explicit_https.graffle/data.plist
diff --git a/...atics/_explicit_https.graffle/image3.icns → ...atics/_explicit_https.graffle/image3.icns b/...atics/_explicit_https.graffle/image3.icns → ...atics/_explicit_https.graffle/image3.icns
diff --git a/...atics/_explicit_https.graffle/image6.tiff → ...atics/_explicit_https.graffle/image6.tiff b/...atics/_explicit_https.graffle/image6.tiff → ...atics/_explicit_https.graffle/image6.tiff
diff --git a/...chematics/_transparent.graffle/data.plist → ...chematics/_transparent.graffle/data.plist b/...chematics/_transparent.graffle/data.plist → ...chematics/_transparent.graffle/data.plist
diff --git a/...hematics/_transparent.graffle/image3.icns → ...hematics/_transparent.graffle/image3.icns b/...hematics/_transparent.graffle/image3.icns → ...hematics/_transparent.graffle/image3.icns
diff --git a/...hematics/_transparent.graffle/image6.tiff → ...hematics/_transparent.graffle/image6.tiff b/...hematics/_transparent.graffle/image6.tiff → ...hematics/_transparent.graffle/image6.tiff
diff --git a/...ics/_transparent_https.graffle/data.plist → ...ics/_transparent_https.graffle/data.plist b/...ics/_transparent_https.graffle/data.plist → ...ics/_transparent_https.graffle/data.plist
diff --git a/...cs/_transparent_https.graffle/image3.icns → ...cs/_transparent_https.graffle/image3.icns b/...cs/_transparent_https.graffle/image3.icns → ...cs/_transparent_https.graffle/image3.icns
diff --git a/...cs/_transparent_https.graffle/image6.tiff → ...cs/_transparent_https.graffle/image6.tiff b/...cs/_transparent_https.graffle/image6.tiff → ...cs/_transparent_https.graffle/image6.tiff
diff --git a/docs/schematics/architecture.pdf → mitmproxy/docs/schematics/architecture.pdf b/docs/schematics/architecture.pdf → mitmproxy/docs/schematics/architecture.pdf
diff --git a/docs/schematics/architecture.png → mitmproxy/docs/schematics/architecture.png b/docs/schematics/architecture.png → mitmproxy/docs/schematics/architecture.png
diff --git a/docs/schematics/architecture.vsdx → mitmproxy/docs/schematics/architecture.vsdx b/docs/schematics/architecture.vsdx → mitmproxy/docs/schematics/architecture.vsdx
diff --git a/...cs/how-mitmproxy-works-explicit-https.png → ...cs/how-mitmproxy-works-explicit-https.png b/...cs/how-mitmproxy-works-explicit-https.png → ...cs/how-mitmproxy-works-explicit-https.png
diff --git a/...hematics/how-mitmproxy-works-explicit.png → ...hematics/how-mitmproxy-works-explicit.png b/...hematics/how-mitmproxy-works-explicit.png → ...hematics/how-mitmproxy-works-explicit.png
diff --git a/...how-mitmproxy-works-transparent-https.png → ...how-mitmproxy-works-transparent-https.png b/...how-mitmproxy-works-transparent-https.png → ...how-mitmproxy-works-transparent-https.png
diff --git a/...atics/how-mitmproxy-works-transparent.png → ...atics/how-mitmproxy-works-transparent.png b/...atics/how-mitmproxy-works-transparent.png → ...atics/how-mitmproxy-works-transparent.png
diff --git a/docs/schematics/proxy-modes-flowchart.png → ...docs/schematics/proxy-modes-flowchart.png b/docs/schematics/proxy-modes-flowchart.png → ...docs/schematics/proxy-modes-flowchart.png
diff --git a/docs/schematics/proxy-modes-regular.png → ...y/docs/schematics/proxy-modes-regular.png b/docs/schematics/proxy-modes-regular.png → ...y/docs/schematics/proxy-modes-regular.png
diff --git a/docs/schematics/proxy-modes-reverse.png → ...y/docs/schematics/proxy-modes-reverse.png b/docs/schematics/proxy-modes-reverse.png → ...y/docs/schematics/proxy-modes-reverse.png
diff --git a/.../schematics/proxy-modes-transparent-1.png → .../schematics/proxy-modes-transparent-1.png b/.../schematics/proxy-modes-transparent-1.png → .../schematics/proxy-modes-transparent-1.png
diff --git a/.../schematics/proxy-modes-transparent-2.png → .../schematics/proxy-modes-transparent-2.png b/.../schematics/proxy-modes-transparent-2.png → .../schematics/proxy-modes-transparent-2.png
diff --git a/.../schematics/proxy-modes-transparent-3.png → .../schematics/proxy-modes-transparent-3.png b/.../schematics/proxy-modes-transparent-3.png → .../schematics/proxy-modes-transparent-3.png
diff --git a/...ematics/proxy-modes-transparent-wrong.png → ...ematics/proxy-modes-transparent-wrong.png b/...ematics/proxy-modes-transparent-wrong.png → ...ematics/proxy-modes-transparent-wrong.png
diff --git a/docs/schematics/proxy-modes-upstream.png → .../docs/schematics/proxy-modes-upstream.png b/docs/schematics/proxy-modes-upstream.png → .../docs/schematics/proxy-modes-upstream.png
diff --git a/docs/schematics/proxy-modes.pdf → mitmproxy/docs/schematics/proxy-modes.pdf b/docs/schematics/proxy-modes.pdf → mitmproxy/docs/schematics/proxy-modes.pdf
diff --git a/docs/schematics/proxy-modes.vsdx → mitmproxy/docs/schematics/proxy-modes.vsdx b/docs/schematics/proxy-modes.vsdx → mitmproxy/docs/schematics/proxy-modes.vsdx
diff --git a/docs/screenshots/firefox3-import.jpg → ...roxy/docs/screenshots/firefox3-import.jpg b/docs/screenshots/firefox3-import.jpg → ...roxy/docs/screenshots/firefox3-import.jpg
diff --git a/docs/screenshots/firefox3-trust.jpg → ...proxy/docs/screenshots/firefox3-trust.jpg b/docs/screenshots/firefox3-trust.jpg → ...proxy/docs/screenshots/firefox3-trust.jpg
diff --git a/docs/screenshots/firefox3.jpg → mitmproxy/docs/screenshots/firefox3.jpg b/docs/screenshots/firefox3.jpg → mitmproxy/docs/screenshots/firefox3.jpg
diff --git a/docs/screenshots/ios-gateway.png → mitmproxy/docs/screenshots/ios-gateway.png b/docs/screenshots/ios-gateway.png → mitmproxy/docs/screenshots/ios-gateway.png
diff --git a/docs/screenshots/ios-installed.png → mitmproxy/docs/screenshots/ios-installed.png b/docs/screenshots/ios-installed.png → mitmproxy/docs/screenshots/ios-installed.png
diff --git a/docs/screenshots/ios-manual.png → mitmproxy/docs/screenshots/ios-manual.png b/docs/screenshots/ios-manual.png → mitmproxy/docs/screenshots/ios-manual.png
diff --git a/docs/screenshots/ios-profile.png → mitmproxy/docs/screenshots/ios-profile.png b/docs/screenshots/ios-profile.png → mitmproxy/docs/screenshots/ios-profile.png
diff --git a/docs/screenshots/ios-reverse.png → mitmproxy/docs/screenshots/ios-reverse.png b/docs/screenshots/ios-reverse.png → mitmproxy/docs/screenshots/ios-reverse.png
diff --git a/docs/screenshots/ios-warning.png → mitmproxy/docs/screenshots/ios-warning.png b/docs/screenshots/ios-warning.png → mitmproxy/docs/screenshots/ios-warning.png
diff --git a/docs/screenshots/mitmproxy-flowview.png → ...y/docs/screenshots/mitmproxy-flowview.png b/docs/screenshots/mitmproxy-flowview.png → ...y/docs/screenshots/mitmproxy-flowview.png
diff --git a/.../screenshots/mitmproxy-intercept-filt.png → .../screenshots/mitmproxy-intercept-filt.png b/.../screenshots/mitmproxy-intercept-filt.png → .../screenshots/mitmproxy-intercept-filt.png
diff --git a/docs/screenshots/mitmproxy-intercept-mid.png → ...s/screenshots/mitmproxy-intercept-mid.png b/docs/screenshots/mitmproxy-intercept-mid.png → ...s/screenshots/mitmproxy-intercept-mid.png
diff --git a/...reenshots/mitmproxy-intercept-options.png → ...reenshots/mitmproxy-intercept-options.png b/...reenshots/mitmproxy-intercept-options.png → ...reenshots/mitmproxy-intercept-options.png
diff --git a/...creenshots/mitmproxy-intercept-result.png → ...creenshots/mitmproxy-intercept-result.png b/...creenshots/mitmproxy-intercept-result.png → ...creenshots/mitmproxy-intercept-result.png
diff --git a/...reenshots/mitmproxy-kveditor-editmode.png → ...reenshots/mitmproxy-kveditor-editmode.png b/...reenshots/mitmproxy-kveditor-editmode.png → ...reenshots/mitmproxy-kveditor-editmode.png
diff --git a/docs/screenshots/mitmproxy-kveditor.png → ...y/docs/screenshots/mitmproxy-kveditor.png b/docs/screenshots/mitmproxy-kveditor.png → ...y/docs/screenshots/mitmproxy-kveditor.png
diff --git a/docs/screenshots/mitmproxy.png → mitmproxy/docs/screenshots/mitmproxy.png b/docs/screenshots/mitmproxy.png → mitmproxy/docs/screenshots/mitmproxy.png
diff --git a/docs/screenshots/osx-addcert-alwaystrust.png → ...s/screenshots/osx-addcert-alwaystrust.png b/docs/screenshots/osx-addcert-alwaystrust.png → ...s/screenshots/osx-addcert-alwaystrust.png
diff --git a/...creenshots/win7-certstore-trustedroot.png → ...creenshots/win7-certstore-trustedroot.png b/...creenshots/win7-certstore-trustedroot.png → ...creenshots/win7-certstore-trustedroot.png
diff --git a/docs/screenshots/win7-certstore.png → ...proxy/docs/screenshots/win7-certstore.png b/docs/screenshots/win7-certstore.png → ...proxy/docs/screenshots/win7-certstore.png
diff --git a/docs/screenshots/win7-wizard.png → mitmproxy/docs/screenshots/win7-wizard.png b/docs/screenshots/win7-wizard.png → mitmproxy/docs/screenshots/win7-wizard.png
diff --git a/docs/screenshots/winpythoninstaller.jpg → ...y/docs/screenshots/winpythoninstaller.jpg b/docs/screenshots/winpythoninstaller.jpg → ...y/docs/screenshots/winpythoninstaller.jpg
diff --git a/docs/scripting/inlinescripts.rst → mitmproxy/docs/scripting/inlinescripts.rst b/docs/scripting/inlinescripts.rst → mitmproxy/docs/scripting/inlinescripts.rst
diff --git a/docs/scripting/libmproxy.rst → mitmproxy/docs/scripting/libmproxy.rst b/docs/scripting/libmproxy.rst → mitmproxy/docs/scripting/libmproxy.rst
diff --git a/docs/transparent.rst → mitmproxy/docs/transparent.rst b/docs/transparent.rst → mitmproxy/docs/transparent.rst
diff --git a/docs/transparent/linux.rst → mitmproxy/docs/transparent/linux.rst b/docs/transparent/linux.rst → mitmproxy/docs/transparent/linux.rst
diff --git a/docs/transparent/osx.rst → mitmproxy/docs/transparent/osx.rst b/docs/transparent/osx.rst → mitmproxy/docs/transparent/osx.rst
diff --git a/docs/tutorials/30second.rst → mitmproxy/docs/tutorials/30second.rst b/docs/tutorials/30second.rst → mitmproxy/docs/tutorials/30second.rst
diff --git a/docs/tutorials/gamecenter.rst → mitmproxy/docs/tutorials/gamecenter.rst b/docs/tutorials/gamecenter.rst → mitmproxy/docs/tutorials/gamecenter.rst
diff --git a/docs/tutorials/leaderboard.png → mitmproxy/docs/tutorials/leaderboard.png b/docs/tutorials/leaderboard.png → mitmproxy/docs/tutorials/leaderboard.png
diff --git a/docs/tutorials/one.png → mitmproxy/docs/tutorials/one.png b/docs/tutorials/one.png → mitmproxy/docs/tutorials/one.png
diff --git a/docs/tutorials/supermega.png → mitmproxy/docs/tutorials/supermega.png b/docs/tutorials/supermega.png → mitmproxy/docs/tutorials/supermega.png
diff --git a/docs/tutorials/transparent-dhcp.rst → ...proxy/docs/tutorials/transparent-dhcp.rst b/docs/tutorials/transparent-dhcp.rst → ...proxy/docs/tutorials/transparent-dhcp.rst
diff --git a/...utorials/transparent-dhcp/step1_proxy.png → ...utorials/transparent-dhcp/step1_proxy.png b/...utorials/transparent-dhcp/step1_proxy.png → ...utorials/transparent-dhcp/step1_proxy.png
diff --git a/...ials/transparent-dhcp/step1_vbox_eth0.png → ...ials/transparent-dhcp/step1_vbox_eth0.png b/...ials/transparent-dhcp/step1_vbox_eth0.png → ...ials/transparent-dhcp/step1_vbox_eth0.png
diff --git a/...ials/transparent-dhcp/step1_vbox_eth1.png → ...ials/transparent-dhcp/step1_vbox_eth1.png b/...ials/transparent-dhcp/step1_vbox_eth1.png → ...ials/transparent-dhcp/step1_vbox_eth1.png
diff --git a/...als/transparent-dhcp/step2_proxied_vm.png → ...als/transparent-dhcp/step2_proxied_vm.png b/...als/transparent-dhcp/step2_proxied_vm.png → ...als/transparent-dhcp/step2_proxied_vm.png
diff --git a/examples/README → mitmproxy/examples/README b/examples/README → mitmproxy/examples/README
diff --git a/examples/add_header.py → mitmproxy/examples/add_header.py b/examples/add_header.py → mitmproxy/examples/add_header.py
diff --git a/examples/change_upstream_proxy.py → mitmproxy/examples/change_upstream_proxy.py b/examples/change_upstream_proxy.py → mitmproxy/examples/change_upstream_proxy.py
diff --git a/examples/custom_contentviews.py → mitmproxy/examples/custom_contentviews.py b/examples/custom_contentviews.py → mitmproxy/examples/custom_contentviews.py
diff --git a/examples/dns_spoofing.py → mitmproxy/examples/dns_spoofing.py b/examples/dns_spoofing.py → mitmproxy/examples/dns_spoofing.py
diff --git a/examples/dup_and_replay.py → mitmproxy/examples/dup_and_replay.py b/examples/dup_and_replay.py → mitmproxy/examples/dup_and_replay.py
diff --git a/examples/filt.py → mitmproxy/examples/filt.py b/examples/filt.py → mitmproxy/examples/filt.py
diff --git a/examples/flowbasic → mitmproxy/examples/flowbasic b/examples/flowbasic → mitmproxy/examples/flowbasic
diff --git a/examples/flowwriter.py → mitmproxy/examples/flowwriter.py b/examples/flowwriter.py → mitmproxy/examples/flowwriter.py
diff --git a/examples/har_extractor.py → mitmproxy/examples/har_extractor.py b/examples/har_extractor.py → mitmproxy/examples/har_extractor.py
diff --git a/examples/iframe_injector.py → mitmproxy/examples/iframe_injector.py b/examples/iframe_injector.py → mitmproxy/examples/iframe_injector.py
diff --git a/examples/mitmproxywrapper.py → mitmproxy/examples/mitmproxywrapper.py b/examples/mitmproxywrapper.py → mitmproxy/examples/mitmproxywrapper.py
diff --git a/examples/modify_form.py → mitmproxy/examples/modify_form.py b/examples/modify_form.py → mitmproxy/examples/modify_form.py
diff --git a/examples/modify_querystring.py → mitmproxy/examples/modify_querystring.py b/examples/modify_querystring.py → mitmproxy/examples/modify_querystring.py
diff --git a/examples/modify_response_body.py → mitmproxy/examples/modify_response_body.py b/examples/modify_response_body.py → mitmproxy/examples/modify_response_body.py
diff --git a/examples/nonblocking.py → mitmproxy/examples/nonblocking.py b/examples/nonblocking.py → mitmproxy/examples/nonblocking.py
diff --git a/examples/proxapp.py → mitmproxy/examples/proxapp.py b/examples/proxapp.py → mitmproxy/examples/proxapp.py
diff --git a/examples/read_dumpfile → mitmproxy/examples/read_dumpfile b/examples/read_dumpfile → mitmproxy/examples/read_dumpfile
diff --git a/examples/redirect_requests.py → mitmproxy/examples/redirect_requests.py b/examples/redirect_requests.py → mitmproxy/examples/redirect_requests.py
diff --git a/examples/sslstrip.py → mitmproxy/examples/sslstrip.py b/examples/sslstrip.py → mitmproxy/examples/sslstrip.py
diff --git a/examples/stickycookies → mitmproxy/examples/stickycookies b/examples/stickycookies → mitmproxy/examples/stickycookies
diff --git a/examples/stream.py → mitmproxy/examples/stream.py b/examples/stream.py → mitmproxy/examples/stream.py
diff --git a/examples/stream_modify.py → mitmproxy/examples/stream_modify.py b/examples/stream_modify.py → mitmproxy/examples/stream_modify.py
diff --git a/examples/stub.py → mitmproxy/examples/stub.py b/examples/stub.py → mitmproxy/examples/stub.py
diff --git a/examples/tcp_message.py → mitmproxy/examples/tcp_message.py b/examples/tcp_message.py → mitmproxy/examples/tcp_message.py
diff --git a/examples/tls_passthrough.py → mitmproxy/examples/tls_passthrough.py b/examples/tls_passthrough.py → mitmproxy/examples/tls_passthrough.py
diff --git a/examples/upsidedownternet.py → mitmproxy/examples/upsidedownternet.py b/examples/upsidedownternet.py → mitmproxy/examples/upsidedownternet.py
diff --git a/libmproxy/__init__.py → mitmproxy/libmproxy/__init__.py b/libmproxy/__init__.py → mitmproxy/libmproxy/__init__.py
diff --git a/libmproxy/cmdline.py → mitmproxy/libmproxy/cmdline.py b/libmproxy/cmdline.py → mitmproxy/libmproxy/cmdline.py
diff --git a/libmproxy/console/__init__.py → mitmproxy/libmproxy/console/__init__.py b/libmproxy/console/__init__.py → mitmproxy/libmproxy/console/__init__.py
diff --git a/libmproxy/console/common.py → mitmproxy/libmproxy/console/common.py b/libmproxy/console/common.py → mitmproxy/libmproxy/console/common.py
diff --git a/libmproxy/console/flowdetailview.py → ...proxy/libmproxy/console/flowdetailview.py b/libmproxy/console/flowdetailview.py → ...proxy/libmproxy/console/flowdetailview.py
diff --git a/libmproxy/console/flowlist.py → mitmproxy/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py → mitmproxy/libmproxy/console/flowlist.py
diff --git a/libmproxy/console/flowview.py → mitmproxy/libmproxy/console/flowview.py b/libmproxy/console/flowview.py → mitmproxy/libmproxy/console/flowview.py
diff --git a/libmproxy/console/grideditor.py → mitmproxy/libmproxy/console/grideditor.py b/libmproxy/console/grideditor.py → mitmproxy/libmproxy/console/grideditor.py
diff --git a/libmproxy/console/help.py → mitmproxy/libmproxy/console/help.py b/libmproxy/console/help.py → mitmproxy/libmproxy/console/help.py
diff --git a/libmproxy/console/options.py → mitmproxy/libmproxy/console/options.py b/libmproxy/console/options.py → mitmproxy/libmproxy/console/options.py
diff --git a/libmproxy/console/palettepicker.py → mitmproxy/libmproxy/console/palettepicker.py b/libmproxy/console/palettepicker.py → mitmproxy/libmproxy/console/palettepicker.py
diff --git a/libmproxy/console/palettes.py → mitmproxy/libmproxy/console/palettes.py b/libmproxy/console/palettes.py → mitmproxy/libmproxy/console/palettes.py
diff --git a/libmproxy/console/pathedit.py → mitmproxy/libmproxy/console/pathedit.py b/libmproxy/console/pathedit.py → mitmproxy/libmproxy/console/pathedit.py
diff --git a/libmproxy/console/searchable.py → mitmproxy/libmproxy/console/searchable.py b/libmproxy/console/searchable.py → mitmproxy/libmproxy/console/searchable.py
diff --git a/libmproxy/console/select.py → mitmproxy/libmproxy/console/select.py b/libmproxy/console/select.py → mitmproxy/libmproxy/console/select.py
diff --git a/libmproxy/console/signals.py → mitmproxy/libmproxy/console/signals.py b/libmproxy/console/signals.py → mitmproxy/libmproxy/console/signals.py
diff --git a/libmproxy/console/statusbar.py → mitmproxy/libmproxy/console/statusbar.py b/libmproxy/console/statusbar.py → mitmproxy/libmproxy/console/statusbar.py
diff --git a/libmproxy/console/tabs.py → mitmproxy/libmproxy/console/tabs.py b/libmproxy/console/tabs.py → mitmproxy/libmproxy/console/tabs.py
diff --git a/libmproxy/console/window.py → mitmproxy/libmproxy/console/window.py b/libmproxy/console/window.py → mitmproxy/libmproxy/console/window.py
diff --git a/libmproxy/contentviews.py → mitmproxy/libmproxy/contentviews.py b/libmproxy/contentviews.py → mitmproxy/libmproxy/contentviews.py
diff --git a/libmproxy/contrib/README → mitmproxy/libmproxy/contrib/README b/libmproxy/contrib/README → mitmproxy/libmproxy/contrib/README
diff --git a/libmproxy/contrib/__init__.py → mitmproxy/libmproxy/contrib/__init__.py b/libmproxy/contrib/__init__.py → mitmproxy/libmproxy/contrib/__init__.py
diff --git a/libmproxy/contrib/jsbeautifier/__init__.py → ...ibmproxy/contrib/jsbeautifier/__init__.py b/libmproxy/contrib/jsbeautifier/__init__.py → ...ibmproxy/contrib/jsbeautifier/__init__.py
diff --git a/...b/jsbeautifier/unpackers/README.specs.mkd → ...b/jsbeautifier/unpackers/README.specs.mkd b/...b/jsbeautifier/unpackers/README.specs.mkd → ...b/jsbeautifier/unpackers/README.specs.mkd
diff --git a/...ontrib/jsbeautifier/unpackers/__init__.py → ...ontrib/jsbeautifier/unpackers/__init__.py b/...ontrib/jsbeautifier/unpackers/__init__.py → ...ontrib/jsbeautifier/unpackers/__init__.py
diff --git a/...ntrib/jsbeautifier/unpackers/evalbased.py → ...ntrib/jsbeautifier/unpackers/evalbased.py b/...ntrib/jsbeautifier/unpackers/evalbased.py → ...ntrib/jsbeautifier/unpackers/evalbased.py
diff --git a/...utifier/unpackers/javascriptobfuscator.py → ...utifier/unpackers/javascriptobfuscator.py b/...utifier/unpackers/javascriptobfuscator.py → ...utifier/unpackers/javascriptobfuscator.py
diff --git a/...rib/jsbeautifier/unpackers/myobfuscate.py → ...rib/jsbeautifier/unpackers/myobfuscate.py b/...rib/jsbeautifier/unpackers/myobfuscate.py → ...rib/jsbeautifier/unpackers/myobfuscate.py
diff --git a/.../contrib/jsbeautifier/unpackers/packer.py → .../contrib/jsbeautifier/unpackers/packer.py b/.../contrib/jsbeautifier/unpackers/packer.py → .../contrib/jsbeautifier/unpackers/packer.py
diff --git a/...ntrib/jsbeautifier/unpackers/urlencode.py → ...ntrib/jsbeautifier/unpackers/urlencode.py b/...ntrib/jsbeautifier/unpackers/urlencode.py → ...ntrib/jsbeautifier/unpackers/urlencode.py
diff --git a/libmproxy/contrib/tls/__init__.py → mitmproxy/libmproxy/contrib/tls/__init__.py b/libmproxy/contrib/tls/__init__.py → mitmproxy/libmproxy/contrib/tls/__init__.py
diff --git a/libmproxy/contrib/tls/_constructs.py → ...roxy/libmproxy/contrib/tls/_constructs.py b/libmproxy/contrib/tls/_constructs.py → ...roxy/libmproxy/contrib/tls/_constructs.py
diff --git a/libmproxy/contrib/tls/utils.py → mitmproxy/libmproxy/contrib/tls/utils.py b/libmproxy/contrib/tls/utils.py → mitmproxy/libmproxy/contrib/tls/utils.py
diff --git a/libmproxy/contrib/wbxml/ASCommandResponse.py → ...mproxy/contrib/wbxml/ASCommandResponse.py b/libmproxy/contrib/wbxml/ASCommandResponse.py → ...mproxy/contrib/wbxml/ASCommandResponse.py
diff --git a/libmproxy/contrib/wbxml/ASWBXML.py → mitmproxy/libmproxy/contrib/wbxml/ASWBXML.py b/libmproxy/contrib/wbxml/ASWBXML.py → mitmproxy/libmproxy/contrib/wbxml/ASWBXML.py
diff --git a/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py → ...bmproxy/contrib/wbxml/ASWBXMLByteQueue.py b/libmproxy/contrib/wbxml/ASWBXMLByteQueue.py → ...bmproxy/contrib/wbxml/ASWBXMLByteQueue.py
diff --git a/libmproxy/contrib/wbxml/ASWBXMLCodePage.py → ...ibmproxy/contrib/wbxml/ASWBXMLCodePage.py b/libmproxy/contrib/wbxml/ASWBXMLCodePage.py → ...ibmproxy/contrib/wbxml/ASWBXMLCodePage.py
diff --git a/libmproxy/contrib/wbxml/GlobalTokens.py → ...y/libmproxy/contrib/wbxml/GlobalTokens.py b/libmproxy/contrib/wbxml/GlobalTokens.py → ...y/libmproxy/contrib/wbxml/GlobalTokens.py
diff --git a/...oxy/contrib/wbxml/InvalidDataException.py → ...oxy/contrib/wbxml/InvalidDataException.py b/...oxy/contrib/wbxml/InvalidDataException.py → ...oxy/contrib/wbxml/InvalidDataException.py
diff --git a/libmproxy/contrib/wbxml/__init__.py → ...proxy/libmproxy/contrib/wbxml/__init__.py b/libmproxy/contrib/wbxml/__init__.py → ...proxy/libmproxy/contrib/wbxml/__init__.py
diff --git a/libmproxy/controller.py → mitmproxy/libmproxy/controller.py b/libmproxy/controller.py → mitmproxy/libmproxy/controller.py
diff --git a/libmproxy/dump.py → mitmproxy/libmproxy/dump.py b/libmproxy/dump.py → mitmproxy/libmproxy/dump.py
diff --git a/libmproxy/exceptions.py → mitmproxy/libmproxy/exceptions.py b/libmproxy/exceptions.py → mitmproxy/libmproxy/exceptions.py
diff --git a/libmproxy/filt.py → mitmproxy/libmproxy/filt.py b/libmproxy/filt.py → mitmproxy/libmproxy/filt.py
diff --git a/libmproxy/flow.py → mitmproxy/libmproxy/flow.py b/libmproxy/flow.py → mitmproxy/libmproxy/flow.py
diff --git a/libmproxy/flow_export.py → mitmproxy/libmproxy/flow_export.py b/libmproxy/flow_export.py → mitmproxy/libmproxy/flow_export.py
diff --git a/libmproxy/flow_format_compat.py → mitmproxy/libmproxy/flow_format_compat.py b/libmproxy/flow_format_compat.py → mitmproxy/libmproxy/flow_format_compat.py
diff --git a/libmproxy/main.py → mitmproxy/libmproxy/main.py b/libmproxy/main.py → mitmproxy/libmproxy/main.py
diff --git a/libmproxy/models/__init__.py → mitmproxy/libmproxy/models/__init__.py b/libmproxy/models/__init__.py → mitmproxy/libmproxy/models/__init__.py
diff --git a/libmproxy/models/connections.py → mitmproxy/libmproxy/models/connections.py b/libmproxy/models/connections.py → mitmproxy/libmproxy/models/connections.py
diff --git a/libmproxy/models/flow.py → mitmproxy/libmproxy/models/flow.py b/libmproxy/models/flow.py → mitmproxy/libmproxy/models/flow.py
diff --git a/libmproxy/models/http.py → mitmproxy/libmproxy/models/http.py b/libmproxy/models/http.py → mitmproxy/libmproxy/models/http.py
diff --git a/libmproxy/onboarding/__init__.py → mitmproxy/libmproxy/onboarding/__init__.py b/libmproxy/onboarding/__init__.py → mitmproxy/libmproxy/onboarding/__init__.py
diff --git a/libmproxy/onboarding/app.py → mitmproxy/libmproxy/onboarding/app.py b/libmproxy/onboarding/app.py → mitmproxy/libmproxy/onboarding/app.py
diff --git a/...proxy/onboarding/static/bootstrap.min.css → ...proxy/onboarding/static/bootstrap.min.css b/...proxy/onboarding/static/bootstrap.min.css → ...proxy/onboarding/static/bootstrap.min.css
diff --git a/...g/static/fontawesome/css/font-awesome.css → ...g/static/fontawesome/css/font-awesome.css b/...g/static/fontawesome/css/font-awesome.css → ...g/static/fontawesome/css/font-awesome.css
diff --git a/...atic/fontawesome/css/font-awesome.min.css → ...atic/fontawesome/css/font-awesome.min.css b/...atic/fontawesome/css/font-awesome.min.css → ...atic/fontawesome/css/font-awesome.min.css
diff --git a/.../static/fontawesome/fonts/FontAwesome.otf → .../static/fontawesome/fonts/FontAwesome.otf b/.../static/fontawesome/fonts/FontAwesome.otf → .../static/fontawesome/fonts/FontAwesome.otf
diff --git a/...fontawesome/fonts/fontawesome-webfont.eot → ...fontawesome/fonts/fontawesome-webfont.eot b/...fontawesome/fonts/fontawesome-webfont.eot → ...fontawesome/fonts/fontawesome-webfont.eot
diff --git a/...fontawesome/fonts/fontawesome-webfont.svg → ...fontawesome/fonts/fontawesome-webfont.svg b/...fontawesome/fonts/fontawesome-webfont.svg → ...fontawesome/fonts/fontawesome-webfont.svg
diff --git a/...fontawesome/fonts/fontawesome-webfont.ttf → ...fontawesome/fonts/fontawesome-webfont.ttf b/...fontawesome/fonts/fontawesome-webfont.ttf → ...fontawesome/fonts/fontawesome-webfont.ttf
diff --git a/...ontawesome/fonts/fontawesome-webfont.woff → ...ontawesome/fonts/fontawesome-webfont.woff b/...ontawesome/fonts/fontawesome-webfont.woff → ...ontawesome/fonts/fontawesome-webfont.woff
diff --git a/libmproxy/onboarding/static/mitmproxy.css → ...libmproxy/onboarding/static/mitmproxy.css b/libmproxy/onboarding/static/mitmproxy.css → ...libmproxy/onboarding/static/mitmproxy.css
diff --git a/libmproxy/onboarding/templates/frame.html → ...libmproxy/onboarding/templates/frame.html b/libmproxy/onboarding/templates/frame.html → ...libmproxy/onboarding/templates/frame.html
diff --git a/libmproxy/onboarding/templates/index.html → ...libmproxy/onboarding/templates/index.html b/libmproxy/onboarding/templates/index.html → ...libmproxy/onboarding/templates/index.html
diff --git a/libmproxy/onboarding/templates/layout.html → ...ibmproxy/onboarding/templates/layout.html b/libmproxy/onboarding/templates/layout.html → ...ibmproxy/onboarding/templates/layout.html
diff --git a/libmproxy/platform/__init__.py → mitmproxy/libmproxy/platform/__init__.py b/libmproxy/platform/__init__.py → mitmproxy/libmproxy/platform/__init__.py
diff --git a/libmproxy/platform/linux.py → mitmproxy/libmproxy/platform/linux.py b/libmproxy/platform/linux.py → mitmproxy/libmproxy/platform/linux.py
diff --git a/libmproxy/platform/osx.py → mitmproxy/libmproxy/platform/osx.py b/libmproxy/platform/osx.py → mitmproxy/libmproxy/platform/osx.py
diff --git a/libmproxy/platform/pf.py → mitmproxy/libmproxy/platform/pf.py b/libmproxy/platform/pf.py → mitmproxy/libmproxy/platform/pf.py
diff --git a/libmproxy/platform/windows.py → mitmproxy/libmproxy/platform/windows.py b/libmproxy/platform/windows.py → mitmproxy/libmproxy/platform/windows.py
diff --git a/libmproxy/protocol/__init__.py → mitmproxy/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py → mitmproxy/libmproxy/protocol/__init__.py
diff --git a/libmproxy/protocol/base.py → mitmproxy/libmproxy/protocol/base.py b/libmproxy/protocol/base.py → mitmproxy/libmproxy/protocol/base.py
diff --git a/libmproxy/protocol/http.py → mitmproxy/libmproxy/protocol/http.py b/libmproxy/protocol/http.py → mitmproxy/libmproxy/protocol/http.py
diff --git a/libmproxy/protocol/http1.py → mitmproxy/libmproxy/protocol/http1.py b/libmproxy/protocol/http1.py → mitmproxy/libmproxy/protocol/http1.py
diff --git a/libmproxy/protocol/http2.py → mitmproxy/libmproxy/protocol/http2.py b/libmproxy/protocol/http2.py → mitmproxy/libmproxy/protocol/http2.py
diff --git a/libmproxy/protocol/http_replay.py → mitmproxy/libmproxy/protocol/http_replay.py b/libmproxy/protocol/http_replay.py → mitmproxy/libmproxy/protocol/http_replay.py
diff --git a/libmproxy/protocol/rawtcp.py → mitmproxy/libmproxy/protocol/rawtcp.py b/libmproxy/protocol/rawtcp.py → mitmproxy/libmproxy/protocol/rawtcp.py
diff --git a/libmproxy/protocol/tls.py → mitmproxy/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py → mitmproxy/libmproxy/protocol/tls.py
diff --git a/libmproxy/proxy/__init__.py → mitmproxy/libmproxy/proxy/__init__.py b/libmproxy/proxy/__init__.py → mitmproxy/libmproxy/proxy/__init__.py
diff --git a/libmproxy/proxy/config.py → mitmproxy/libmproxy/proxy/config.py b/libmproxy/proxy/config.py → mitmproxy/libmproxy/proxy/config.py
diff --git a/libmproxy/proxy/modes/__init__.py → mitmproxy/libmproxy/proxy/modes/__init__.py b/libmproxy/proxy/modes/__init__.py → mitmproxy/libmproxy/proxy/modes/__init__.py
diff --git a/libmproxy/proxy/modes/http_proxy.py → ...proxy/libmproxy/proxy/modes/http_proxy.py b/libmproxy/proxy/modes/http_proxy.py → ...proxy/libmproxy/proxy/modes/http_proxy.py
diff --git a/libmproxy/proxy/modes/reverse_proxy.py → ...xy/libmproxy/proxy/modes/reverse_proxy.py b/libmproxy/proxy/modes/reverse_proxy.py → ...xy/libmproxy/proxy/modes/reverse_proxy.py
diff --git a/libmproxy/proxy/modes/socks_proxy.py → ...roxy/libmproxy/proxy/modes/socks_proxy.py b/libmproxy/proxy/modes/socks_proxy.py → ...roxy/libmproxy/proxy/modes/socks_proxy.py
diff --git a/libmproxy/proxy/modes/transparent_proxy.py → ...ibmproxy/proxy/modes/transparent_proxy.py b/libmproxy/proxy/modes/transparent_proxy.py → ...ibmproxy/proxy/modes/transparent_proxy.py
diff --git a/libmproxy/proxy/root_context.py → mitmproxy/libmproxy/proxy/root_context.py b/libmproxy/proxy/root_context.py → mitmproxy/libmproxy/proxy/root_context.py
diff --git a/libmproxy/proxy/server.py → mitmproxy/libmproxy/proxy/server.py b/libmproxy/proxy/server.py → mitmproxy/libmproxy/proxy/server.py
diff --git a/libmproxy/script/__init__.py → mitmproxy/libmproxy/script/__init__.py b/libmproxy/script/__init__.py → mitmproxy/libmproxy/script/__init__.py
diff --git a/libmproxy/script/concurrent.py → mitmproxy/libmproxy/script/concurrent.py b/libmproxy/script/concurrent.py → mitmproxy/libmproxy/script/concurrent.py
diff --git a/libmproxy/script/reloader.py → mitmproxy/libmproxy/script/reloader.py b/libmproxy/script/reloader.py → mitmproxy/libmproxy/script/reloader.py
diff --git a/libmproxy/script/script.py → mitmproxy/libmproxy/script/script.py b/libmproxy/script/script.py → mitmproxy/libmproxy/script/script.py
diff --git a/libmproxy/script/script_context.py → mitmproxy/libmproxy/script/script_context.py b/libmproxy/script/script_context.py → mitmproxy/libmproxy/script/script_context.py
diff --git a/libmproxy/stateobject.py → mitmproxy/libmproxy/stateobject.py b/libmproxy/stateobject.py → mitmproxy/libmproxy/stateobject.py
diff --git a/libmproxy/tnetstring.py → mitmproxy/libmproxy/tnetstring.py b/libmproxy/tnetstring.py → mitmproxy/libmproxy/tnetstring.py
diff --git a/libmproxy/utils.py → mitmproxy/libmproxy/utils.py b/libmproxy/utils.py → mitmproxy/libmproxy/utils.py
diff --git a/libmproxy/version.py → mitmproxy/libmproxy/version.py b/libmproxy/version.py → mitmproxy/libmproxy/version.py
diff --git a/libmproxy/web/__init__.py → mitmproxy/libmproxy/web/__init__.py b/libmproxy/web/__init__.py → mitmproxy/libmproxy/web/__init__.py
diff --git a/libmproxy/web/app.py → mitmproxy/libmproxy/web/app.py b/libmproxy/web/app.py → mitmproxy/libmproxy/web/app.py
diff --git a/libmproxy/web/static/app.css → mitmproxy/libmproxy/web/static/app.css b/libmproxy/web/static/app.css → mitmproxy/libmproxy/web/static/app.css
diff --git a/libmproxy/web/static/app.js → mitmproxy/libmproxy/web/static/app.js b/libmproxy/web/static/app.js → mitmproxy/libmproxy/web/static/app.js
diff --git a/.../web/static/fonts/fontawesome-webfont.eot → .../web/static/fonts/fontawesome-webfont.eot b/.../web/static/fonts/fontawesome-webfont.eot → .../web/static/fonts/fontawesome-webfont.eot
diff --git a/.../web/static/fonts/fontawesome-webfont.svg → .../web/static/fonts/fontawesome-webfont.svg b/.../web/static/fonts/fontawesome-webfont.svg → .../web/static/fonts/fontawesome-webfont.svg
diff --git a/.../web/static/fonts/fontawesome-webfont.ttf → .../web/static/fonts/fontawesome-webfont.ttf b/.../web/static/fonts/fontawesome-webfont.ttf → .../web/static/fonts/fontawesome-webfont.ttf
diff --git a/...web/static/fonts/fontawesome-webfont.woff → ...web/static/fonts/fontawesome-webfont.woff b/...web/static/fonts/fontawesome-webfont.woff → ...web/static/fonts/fontawesome-webfont.woff
diff --git a/...web/static/images/chrome-devtools/LICENSE → ...web/static/images/chrome-devtools/LICENSE b/...web/static/images/chrome-devtools/LICENSE → ...web/static/images/chrome-devtools/LICENSE
diff --git a/...mages/chrome-devtools/resourceCSSIcon.png → ...mages/chrome-devtools/resourceCSSIcon.png b/...mages/chrome-devtools/resourceCSSIcon.png → ...mages/chrome-devtools/resourceCSSIcon.png
diff --git a/.../chrome-devtools/resourceDocumentIcon.png → .../chrome-devtools/resourceDocumentIcon.png b/.../chrome-devtools/resourceDocumentIcon.png → .../chrome-devtools/resourceDocumentIcon.png
diff --git a/...images/chrome-devtools/resourceJSIcon.png → ...images/chrome-devtools/resourceJSIcon.png b/...images/chrome-devtools/resourceJSIcon.png → ...images/chrome-devtools/resourceJSIcon.png
diff --git a/...ges/chrome-devtools/resourcePlainIcon.png → ...ges/chrome-devtools/resourcePlainIcon.png b/...ges/chrome-devtools/resourcePlainIcon.png → ...ges/chrome-devtools/resourcePlainIcon.png
diff --git a/.../static/images/resourceExecutableIcon.png → .../static/images/resourceExecutableIcon.png b/.../static/images/resourceExecutableIcon.png → .../static/images/resourceExecutableIcon.png
diff --git a/...y/web/static/images/resourceFlashIcon.png → ...y/web/static/images/resourceFlashIcon.png b/...y/web/static/images/resourceFlashIcon.png → ...y/web/static/images/resourceFlashIcon.png
diff --git a/...y/web/static/images/resourceImageIcon.png → ...y/web/static/images/resourceImageIcon.png b/...y/web/static/images/resourceImageIcon.png → ...y/web/static/images/resourceImageIcon.png
diff --git a/...xy/web/static/images/resourceJavaIcon.png → ...xy/web/static/images/resourceJavaIcon.png b/...xy/web/static/images/resourceJavaIcon.png → ...xy/web/static/images/resourceJavaIcon.png
diff --git a/...static/images/resourceNotModifiedIcon.png → ...static/images/resourceNotModifiedIcon.png b/...static/images/resourceNotModifiedIcon.png → ...static/images/resourceNotModifiedIcon.png
diff --git a/...eb/static/images/resourceRedirectIcon.png → ...eb/static/images/resourceRedirectIcon.png b/...eb/static/images/resourceRedirectIcon.png → ...eb/static/images/resourceRedirectIcon.png
diff --git a/libmproxy/web/static/vendor.css → mitmproxy/libmproxy/web/static/vendor.css b/libmproxy/web/static/vendor.css → mitmproxy/libmproxy/web/static/vendor.css
diff --git a/libmproxy/web/static/vendor.js → mitmproxy/libmproxy/web/static/vendor.js b/libmproxy/web/static/vendor.js → mitmproxy/libmproxy/web/static/vendor.js
diff --git a/libmproxy/web/templates/index.html → mitmproxy/libmproxy/web/templates/index.html b/libmproxy/web/templates/index.html → mitmproxy/libmproxy/web/templates/index.html
diff --git a/libmproxy/webfonts/fontawesome-webfont.eot → ...ibmproxy/webfonts/fontawesome-webfont.eot b/libmproxy/webfonts/fontawesome-webfont.eot → ...ibmproxy/webfonts/fontawesome-webfont.eot
diff --git a/libmproxy/webfonts/fontawesome-webfont.svg → ...ibmproxy/webfonts/fontawesome-webfont.svg b/libmproxy/webfonts/fontawesome-webfont.svg → ...ibmproxy/webfonts/fontawesome-webfont.svg
diff --git a/libmproxy/webfonts/fontawesome-webfont.ttf → ...ibmproxy/webfonts/fontawesome-webfont.ttf b/libmproxy/webfonts/fontawesome-webfont.ttf → ...ibmproxy/webfonts/fontawesome-webfont.ttf
diff --git a/libmproxy/webfonts/fontawesome-webfont.woff → ...bmproxy/webfonts/fontawesome-webfont.woff b/libmproxy/webfonts/fontawesome-webfont.woff → ...bmproxy/webfonts/fontawesome-webfont.woff
diff --git a/mitmdump → mitmproxy/mitmdump b/mitmdump → mitmproxy/mitmdump
diff --git a/mitmproxy → mitmproxy/mitmproxy b/mitmproxy → mitmproxy/mitmproxy
diff --git a/mitmweb → mitmproxy/mitmweb b/mitmweb → mitmproxy/mitmweb
diff --git a/release/mitmdump.spec → mitmproxy/release/mitmdump.spec b/release/mitmdump.spec → mitmproxy/release/mitmdump.spec
diff --git a/release/mitmproxy.spec → mitmproxy/release/mitmproxy.spec b/release/mitmproxy.spec → mitmproxy/release/mitmproxy.spec
diff --git a/release/mitmweb.spec → mitmproxy/release/mitmweb.spec b/release/mitmweb.spec → mitmproxy/release/mitmweb.spec
diff --git a/requirements.txt → mitmproxy/requirements.txt b/requirements.txt → mitmproxy/requirements.txt
diff --git a/setup.cfg → mitmproxy/setup.cfg b/setup.cfg → mitmproxy/setup.cfg
diff --git a/setup.py → mitmproxy/setup.py b/setup.py → mitmproxy/setup.py
diff --git a/test/__init__.py → mitmproxy/test/__init__.py b/test/__init__.py → mitmproxy/test/__init__.py
diff --git a/test/completion/aaa → mitmproxy/test/completion/aaa b/test/completion/aaa → mitmproxy/test/completion/aaa
diff --git a/test/completion/aab → mitmproxy/test/completion/aab b/test/completion/aab → mitmproxy/test/completion/aab
diff --git a/test/completion/aac → mitmproxy/test/completion/aac b/test/completion/aac → mitmproxy/test/completion/aac
diff --git a/test/data/1.css → mitmproxy/test/data/1.css b/test/data/1.css → mitmproxy/test/data/1.css
diff --git a/test/data/amf01 → mitmproxy/test/data/amf01 b/test/data/amf01 → mitmproxy/test/data/amf01
diff --git a/test/data/amf02 → mitmproxy/test/data/amf02 b/test/data/amf02 → mitmproxy/test/data/amf02
diff --git a/test/data/amf03 → mitmproxy/test/data/amf03 b/test/data/amf03 → mitmproxy/test/data/amf03
diff --git a/test/data/clientcert/.gitignore → mitmproxy/test/data/clientcert/.gitignore b/test/data/clientcert/.gitignore → mitmproxy/test/data/clientcert/.gitignore
diff --git a/test/data/clientcert/127.0.0.1.pem → mitmproxy/test/data/clientcert/127.0.0.1.pem b/test/data/clientcert/127.0.0.1.pem → mitmproxy/test/data/clientcert/127.0.0.1.pem
diff --git a/test/data/clientcert/client.cnf → mitmproxy/test/data/clientcert/client.cnf b/test/data/clientcert/client.cnf → mitmproxy/test/data/clientcert/client.cnf
diff --git a/test/data/clientcert/client.pem → mitmproxy/test/data/clientcert/client.pem b/test/data/clientcert/client.pem → mitmproxy/test/data/clientcert/client.pem
diff --git a/test/data/clientcert/make → mitmproxy/test/data/clientcert/make b/test/data/clientcert/make → mitmproxy/test/data/clientcert/make
diff --git a/test/data/confdir/mitmproxy-ca-cert.cer → ...y/test/data/confdir/mitmproxy-ca-cert.cer b/test/data/confdir/mitmproxy-ca-cert.cer → ...y/test/data/confdir/mitmproxy-ca-cert.cer
diff --git a/test/data/confdir/mitmproxy-ca-cert.p12 → ...y/test/data/confdir/mitmproxy-ca-cert.p12 b/test/data/confdir/mitmproxy-ca-cert.p12 → ...y/test/data/confdir/mitmproxy-ca-cert.p12
diff --git a/test/data/confdir/mitmproxy-ca-cert.pem → ...y/test/data/confdir/mitmproxy-ca-cert.pem b/test/data/confdir/mitmproxy-ca-cert.pem → ...y/test/data/confdir/mitmproxy-ca-cert.pem
diff --git a/test/data/confdir/mitmproxy-ca.pem → mitmproxy/test/data/confdir/mitmproxy-ca.pem b/test/data/confdir/mitmproxy-ca.pem → mitmproxy/test/data/confdir/mitmproxy-ca.pem