mitmproxy: Update net/mitmproxy to 3.0.3

pkgsrc changes:
 - Sync DEPENDS with upstream setup.py
 - Update DESCR to reflect current reality

Changes:
23 February 2018: mitmproxy 3.0
  * Fix a quote-related issue affecting the mitmproxy console command prompt

22 February 2018: mitmproxy 3.0
    Major Changes
    -------------
  * Commands: A consistent, typed mechanism that allows addons to expose
    actions to users.
  * Options: A typed settings store for use by mitmproxy and addons.
  * Shift most of mitmproxy's own functionality into addons.
  * Major improvements to mitmproxy console, including an almost complete
    rewrite of the user interface, integration of commands, key bindings, and
    multi-pane layouts.
  * Major Improvements to mitmproxy’s web interface, mitmweb. (Matthew Shao,
    Google Summer of Code 2017)
  * Major Improvements to mitmproxy’s content views and protocol layers (Ujjwal
    Verma, Google Summer of Code 2017)
  * Faster JavaScript and CSS beautifiers. (Ujjwal Verma)

    Minor Changes
    -------------
  * Vastly improved JavaScript test coverage (Matthew Shao)
  * Options editor for mitmweb (Matthew Shao)
  * Static web-based flow viewer (Matthew Shao)
  * Request streaming for HTTP/1.x and HTTP/2 (Ujjwal Verma)
  * Implement more robust content views using Kaitai Struct (Ujjwal Verma)
  * Protobuf decoding now works without protoc being installed on the host
    system (Ujjwal Verma)
  * PNG, GIF, and JPEG can now be parsed without Pillow, which simplifies
    mitmproxy installation and moves parsing from unsafe C to pure Python
    (Ujjwal Verma)
  * Add parser for ICO files (Ujjwal Verma)
  * Migrate WebSockets implementation to wsproto. This reduces code size and
    adds WebSocket compression support. (Ujjwal Verma)
  * Add “split view” to split mitmproxy’s UI into two separate panes.
  * Add key binding viewer and editor
  * Add a command to spawn a preconfigured Chrome browser instance from
    mitmproxy
  * Fully support mitmproxy under the Windows Subsystem for Linux (WSL), work
    around display errors
  * Add XSS scanner addon (@ddworken)
  * Add ability to toggle interception (@mattweidner)
  * Numerous documentation improvements (@pauloromeira, @rst0git, @rgerganov,
    @fulldecent, @zhigang1992, @F1ashhimself, @vinaydargar, @jonathanrfisher1,
    @BasThomas, @LuD1161, @ayamamori, @TomTasche)
  * Add filters for websocket flows (@s4chin)
  * Make it possible to create a response to CONNECT requests in http_connect
    (@mengbiping)
  * Redirect stdout in scripts to ctx.log.warn (@nikofil)
  * Fix a crash when clearing the event log (@krsoninikhil)
  * Store the generated certificate for each flow (@dlenski)
  * Add --keep-host-header to retain the host header in reverse proxy mode
    (@krsoninikhil)
  * Fix setting palette options (@JordanLoehr)
  * Fix a crash with brotli encoding (@whackashoe)
  * Provide certificate installation instructions on mitm.it (@ritiek)
  * Fix a bug where we did not properly fall back to IPv4 when IPv6 is
    unavailable (@titeuf87)
  * Fix transparent mode on IPv6-enabled macOS systems (@Ga-ryo)
  * Fix handling of HTTP messages with multiple Content-Length headers
    (@surajt97)
  * Fix IPv6 authority form parsing in CONNECT requests (@r1b)
  * Fix event log display in mitmweb (@syahn)
  * Remove private key from PKCS12 file in ~/.mitmproxy (@ograff).
  * Add LDAP as a proxy authentication backend (@charlesdhdt)
  * Use mypy to check the whole codebase (@iharsh234)
  * Fix a crash when duplicating flows (@iharsh234)
  * Fix testsuite when the path contains a “.” (@felixonmars)
  * Store proxy authentication with flows (@lymanZerga11)
  * Match ~d and ~u filters against pretty_host (@dequis)
  * Update WBXML content view (@davidpshaw)
  * Handle HEAD requests for mitm.it to support Chrome in transparent mode on
    iOS (@tomlabaude)
  * Update dns spoofing example to use --keep-host-header (@krsoninikhil)
  * Call error handler on HTTPException (@tarnacious)
  * Make it possible to remove TLS from upstream HTTP connections
  * Update to pyOpenSSL 17.5, cryptography 2.1.4, and OpenSSL 1.1.0g
  * Make it possible to retroactively increase log verbosity.
  * Make logging from addons thread-safe
  * Tolerate imports in user scripts that match hook names (`from mitmproxy
    import log`)
  * Update mitmweb to React 16, which brings performance improvements
  * Fix a bug where reverting duplicated flows crashes mitmproxy
  * Fix a bug where successive requests are sent to the wrong host after a
    request has been redirected.
  * Fix a bug that binds outgoing connections to the wrong interface
  * Fix a bug where custom certificates are ignored in reverse proxy mode
  * Fix import of flows that have been created with mitmproxy 0.17
  * Fix formatting of (IPv6) IP addresses in a number of places
  * Fix replay for HTTP/2 flows
  * Decouple mitmproxy version and flow file format version
  * Fix a bug where “mitmdump -nr” does not exit automatically
  * Fix a crash when exporting flows to curl
  * Fix formatting of sticky cookies
  * Improve script reloading reliability by polling the filesystem instead of
    using watchdog
  * Fix a crash when refreshing Set-Cookie headers
  * Add connection indicator to mitmweb to alert users when the proxy server
    stops running
  * Add support for certificates with cyrillic domains
  * Simplify output of mitmproxy --version
  * Add Request.make to simplify request creation in scripts
  * Pathoc: Include a host header on CONNECT requests
  * Remove HTML outline contentview (#2572)
  * Remove Python and Locust export (#2465)
  * Remove emojis from tox.ini because flake8 cannot parse that. :(

5 files changed, 558 insertions, 497 deletions

diff --git a/net/mitmproxy/DESCR b/net/mitmproxy/DESCR
index bd09dfeb75a..3d9739b0630 100644
--- a/net/mitmproxy/DESCR
+++ b/net/mitmproxy/DESCR
@@ -6,4 +6,8 @@ for HTTP with a console interface.
 mitmdump is the command-line version of mitmproxy. Think tcpdump
 for HTTP.
 
-libmproxy is the library that mitmproxy and mitmdump are built on.
+mitmweb is a web-based interface for mitmproxy.
+
+pathoc and pathod are perverse HTTP client and server applications
+designed to let you craft almost any conceivable HTTP request,
+including ones that creatively violate the standards.
diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile
index 099f26f8951..284a46117dd 100644
--- a/net/mitmproxy/Makefile
+++ b/net/mitmproxy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2017/09/03 08:53:12 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/02/26 12:28:48 leot Exp $
 
-DISTNAME=	mitmproxy-2.0.2
+DISTNAME=	mitmproxy-3.0.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mitmproxy/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -10,36 +10,35 @@ HOMEPAGE=	https://mitmproxy.org/
 COMMENT=	Interactive console program for inspecting and editing traffic flows
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL
-DEPENDS+=	${PYPKGPREFIX}-Pillow>=3.2:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=17.5:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-asn1>=0.1.9:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker
-DEPENDS+=	${PYPKGPREFIX}-brotlipy>=0.5.1:../../archivers/py-brotlipy
+DEPENDS+=	${PYPKGPREFIX}-brotlipy>=0.7.0:../../archivers/py-brotlipy
 DEPENDS+=	${PYPKGPREFIX}-certifi>=2015.11.20.1:../../security/py-certifi
 DEPENDS+=	${PYPKGPREFIX}-click>=6.2:../../devel/py-click
 DEPENDS+=	${PYPKGPREFIX}-configargparse>=0.10.0:../../devel/py-configargparse
 DEPENDS+=	${PYPKGPREFIX}-construct>=2.5.2:../../devel/py-construct
-DEPENDS+=	${PYPKGPREFIX}-cryptography>=1.3:../../security/py-cryptography
+DEPENDS+=	${PYPKGPREFIX}-cryptography>=2.1.4:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-cssutils>=1.0.1:../../textproc/py-cssutils
-DEPENDS+=	${PYPKGPREFIX}-flask>=0.10.1:../../www/py-flask
-DEPENDS+=	${PYPKGPREFIX}-h2>=2.5.1:../../www/py-h2
+DEPENDS+=	${PYPKGPREFIX}-h11>=0.7.0:../../www/py-h11
+DEPENDS+=	${PYPKGPREFIX}-h2>=3.0.1:../../www/py-h2
 DEPENDS+=	${PYPKGPREFIX}-hpack>=2.1.0:../../net/py-hpack
 DEPENDS+=	${PYPKGPREFIX}-html2text>=2016.1.8:../../textproc/py-html2text
-DEPENDS+=	${PYPKGPREFIX}-hyperframe>=4.0.1:../../www/py-hyperframe
-DEPENDS+=	${PYPKGPREFIX}-jsbeautifier>=1.6.3:../../textproc/py-jsbeautifier
-DEPENDS+=	${PYPKGPREFIX}-kaitaistruct>=0.6:../../devel/py-kaitaistruct
-DEPENDS+=	${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml
+DEPENDS+=	${PYPKGPREFIX}-hyperframe>=5.1.0:../../www/py-hyperframe
+DEPENDS+=	${PYPKGPREFIX}-kaitaistruct>=0.7:../../devel/py-kaitaistruct
+DEPENDS+=	${PYPKGPREFIX}-ldap3>=2.4:../../databases/py-ldap3
 DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6.5:../../security/py-passlib
 DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.1.3:../../devel/py-pyparsing
-DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.5.22:../../x11/py-pyperclip
+DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.6.0:../../x11/py-pyperclip
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.9.1:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-ruamel-yaml>=0.13.2:../../devel/py-ruamel-yaml
-DEPENDS+=	${PYPKGPREFIX}-requests>=2.9.1:../../devel/py-requests
-DEPENDS+=	${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=1.5.4:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-tornado>=4.3.0:../../www/py-tornado
-DEPENDS+=	${PYPKGPREFIX}-urwid>=1.3.1:../../devel/py-urwid
+DEPENDS+=	${PYPKGPREFIX}-urwid>=2.0.1:../../devel/py-urwid
 DEPENDS+=	${PYPKGPREFIX}-watchdog>=0.8.3:../../sysutils/py-watchdog
+DEPENDS+=	${PYPKGPREFIX}-wsproto>=0.11.0:../../www/py-wsproto
+
+REPLACE_SH+=	mitmproxy/contrib/kaitaistruct/make.sh
 
 USE_LANGUAGES=			# none
 PYTHON_VERSIONS_INCOMPATIBLE=	27 34
diff --git a/net/mitmproxy/PLIST b/net/mitmproxy/PLIST
index 45bd4c72961..71d978d4f2e 100644
--- a/net/mitmproxy/PLIST
+++ b/net/mitmproxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/04/14 13:15:04 leot Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/02/26 12:28:48 leot Exp $
 bin/mitmdump
 bin/mitmproxy
 bin/mitmweb
@@ -11,116 +11,68 @@ ${PYSITELIB}/${EGG_FILE}/entry_points.txt
 ${PYSITELIB}/${EGG_FILE}/requires.txt
 ${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/mitmproxy/__init__.py
-${PYSITELIB}/mitmproxy/__init__.pyo
 ${PYSITELIB}/mitmproxy/__init__.pyc
-${PYSITELIB}/mitmproxy/addonmanager.pyo
-${PYSITELIB}/mitmproxy/addonmanager.pyc
-${PYSITELIB}/mitmproxy/certs.pyo
-${PYSITELIB}/mitmproxy/certs.pyc
-${PYSITELIB}/mitmproxy/connections.pyo
-${PYSITELIB}/mitmproxy/connections.pyc
-${PYSITELIB}/mitmproxy/controller.pyo
-${PYSITELIB}/mitmproxy/controller.pyc
-${PYSITELIB}/mitmproxy/ctx.pyo
-${PYSITELIB}/mitmproxy/ctx.pyc
-${PYSITELIB}/mitmproxy/eventsequence.pyo
-${PYSITELIB}/mitmproxy/eventsequence.pyc
-${PYSITELIB}/mitmproxy/exceptions.pyo
-${PYSITELIB}/mitmproxy/exceptions.pyc
-${PYSITELIB}/mitmproxy/export.pyo
-${PYSITELIB}/mitmproxy/export.pyc
-${PYSITELIB}/mitmproxy/flow.pyo
-${PYSITELIB}/mitmproxy/flow.pyc
-${PYSITELIB}/mitmproxy/flowfilter.pyo
-${PYSITELIB}/mitmproxy/flowfilter.pyc
-${PYSITELIB}/mitmproxy/http.pyo
-${PYSITELIB}/mitmproxy/http.pyc
-${PYSITELIB}/mitmproxy/io.pyo
-${PYSITELIB}/mitmproxy/io.pyc
-${PYSITELIB}/mitmproxy/io_compat.pyo
-${PYSITELIB}/mitmproxy/io_compat.pyc
-${PYSITELIB}/mitmproxy/log.pyo
-${PYSITELIB}/mitmproxy/log.pyc
-${PYSITELIB}/mitmproxy/master.pyo
-${PYSITELIB}/mitmproxy/master.pyc
-${PYSITELIB}/mitmproxy/options.pyo
-${PYSITELIB}/mitmproxy/options.pyc
-${PYSITELIB}/mitmproxy/optmanager.pyo
-${PYSITELIB}/mitmproxy/optmanager.pyc
-${PYSITELIB}/mitmproxy/stateobject.pyo
-${PYSITELIB}/mitmproxy/stateobject.pyc
-${PYSITELIB}/mitmproxy/tcp.pyo
-${PYSITELIB}/mitmproxy/tcp.pyc
-${PYSITELIB}/mitmproxy/version.pyo
-${PYSITELIB}/mitmproxy/version.pyc
-${PYSITELIB}/mitmproxy/websocket.pyo
-${PYSITELIB}/mitmproxy/websocket.pyc
+${PYSITELIB}/mitmproxy/__init__.pyo
 ${PYSITELIB}/mitmproxy/addonmanager.py
+${PYSITELIB}/mitmproxy/addonmanager.pyc
+${PYSITELIB}/mitmproxy/addonmanager.pyo
 ${PYSITELIB}/mitmproxy/addons/__init__.py
-${PYSITELIB}/mitmproxy/addons/__init__.pyo
 ${PYSITELIB}/mitmproxy/addons/__init__.pyc
-${PYSITELIB}/mitmproxy/addons/anticache.pyo
-${PYSITELIB}/mitmproxy/addons/anticache.pyc
-${PYSITELIB}/mitmproxy/addons/anticomp.pyo
-${PYSITELIB}/mitmproxy/addons/anticomp.pyc
-${PYSITELIB}/mitmproxy/addons/check_alpn.pyo
-${PYSITELIB}/mitmproxy/addons/check_alpn.pyc
-${PYSITELIB}/mitmproxy/addons/check_ca.pyo
-${PYSITELIB}/mitmproxy/addons/check_ca.pyc
-${PYSITELIB}/mitmproxy/addons/clientplayback.pyo
-${PYSITELIB}/mitmproxy/addons/clientplayback.pyc
-${PYSITELIB}/mitmproxy/addons/disable_h2c_upgrade.pyo
-${PYSITELIB}/mitmproxy/addons/disable_h2c_upgrade.pyc
-${PYSITELIB}/mitmproxy/addons/dumper.pyo
-${PYSITELIB}/mitmproxy/addons/dumper.pyc
-${PYSITELIB}/mitmproxy/addons/eventstore.pyo
-${PYSITELIB}/mitmproxy/addons/eventstore.pyc
-${PYSITELIB}/mitmproxy/addons/intercept.pyo
-${PYSITELIB}/mitmproxy/addons/intercept.pyc
-${PYSITELIB}/mitmproxy/addons/onboarding.pyo
-${PYSITELIB}/mitmproxy/addons/onboarding.pyc
-${PYSITELIB}/mitmproxy/addons/proxyauth.pyo
-${PYSITELIB}/mitmproxy/addons/proxyauth.pyc
-${PYSITELIB}/mitmproxy/addons/replace.pyo
-${PYSITELIB}/mitmproxy/addons/replace.pyc
-${PYSITELIB}/mitmproxy/addons/script.pyo
-${PYSITELIB}/mitmproxy/addons/script.pyc
-${PYSITELIB}/mitmproxy/addons/serverplayback.pyo
-${PYSITELIB}/mitmproxy/addons/serverplayback.pyc
-${PYSITELIB}/mitmproxy/addons/setheaders.pyo
-${PYSITELIB}/mitmproxy/addons/setheaders.pyc
-${PYSITELIB}/mitmproxy/addons/stickyauth.pyo
-${PYSITELIB}/mitmproxy/addons/stickyauth.pyc
-${PYSITELIB}/mitmproxy/addons/stickycookie.pyo
-${PYSITELIB}/mitmproxy/addons/stickycookie.pyc
-${PYSITELIB}/mitmproxy/addons/streambodies.pyo
-${PYSITELIB}/mitmproxy/addons/streambodies.pyc
-${PYSITELIB}/mitmproxy/addons/streamfile.pyo
-${PYSITELIB}/mitmproxy/addons/streamfile.pyc
-${PYSITELIB}/mitmproxy/addons/termlog.pyo
-${PYSITELIB}/mitmproxy/addons/termlog.pyc
-${PYSITELIB}/mitmproxy/addons/upstream_auth.pyo
-${PYSITELIB}/mitmproxy/addons/upstream_auth.pyc
-${PYSITELIB}/mitmproxy/addons/view.pyo
-${PYSITELIB}/mitmproxy/addons/view.pyc
-${PYSITELIB}/mitmproxy/addons/wsgiapp.pyo
-${PYSITELIB}/mitmproxy/addons/wsgiapp.pyc
+${PYSITELIB}/mitmproxy/addons/__init__.pyo
+${PYSITELIB}/mitmproxy/addons/allowremote.py
+${PYSITELIB}/mitmproxy/addons/allowremote.pyc
+${PYSITELIB}/mitmproxy/addons/allowremote.pyo
 ${PYSITELIB}/mitmproxy/addons/anticache.py
+${PYSITELIB}/mitmproxy/addons/anticache.pyc
+${PYSITELIB}/mitmproxy/addons/anticache.pyo
 ${PYSITELIB}/mitmproxy/addons/anticomp.py
-${PYSITELIB}/mitmproxy/addons/check_alpn.py
+${PYSITELIB}/mitmproxy/addons/anticomp.pyc
+${PYSITELIB}/mitmproxy/addons/anticomp.pyo
+${PYSITELIB}/mitmproxy/addons/browser.py
+${PYSITELIB}/mitmproxy/addons/browser.pyc
+${PYSITELIB}/mitmproxy/addons/browser.pyo
 ${PYSITELIB}/mitmproxy/addons/check_ca.py
+${PYSITELIB}/mitmproxy/addons/check_ca.pyc
+${PYSITELIB}/mitmproxy/addons/check_ca.pyo
 ${PYSITELIB}/mitmproxy/addons/clientplayback.py
-${PYSITELIB}/mitmproxy/addons/disable_h2c_upgrade.py
+${PYSITELIB}/mitmproxy/addons/clientplayback.pyc
+${PYSITELIB}/mitmproxy/addons/clientplayback.pyo
+${PYSITELIB}/mitmproxy/addons/core.py
+${PYSITELIB}/mitmproxy/addons/core.pyc
+${PYSITELIB}/mitmproxy/addons/core.pyo
+${PYSITELIB}/mitmproxy/addons/core_option_validation.py
+${PYSITELIB}/mitmproxy/addons/core_option_validation.pyc
+${PYSITELIB}/mitmproxy/addons/core_option_validation.pyo
+${PYSITELIB}/mitmproxy/addons/cut.py
+${PYSITELIB}/mitmproxy/addons/cut.pyc
+${PYSITELIB}/mitmproxy/addons/cut.pyo
+${PYSITELIB}/mitmproxy/addons/disable_h2c.py
+${PYSITELIB}/mitmproxy/addons/disable_h2c.pyc
+${PYSITELIB}/mitmproxy/addons/disable_h2c.pyo
 ${PYSITELIB}/mitmproxy/addons/dumper.py
+${PYSITELIB}/mitmproxy/addons/dumper.pyc
+${PYSITELIB}/mitmproxy/addons/dumper.pyo
 ${PYSITELIB}/mitmproxy/addons/eventstore.py
+${PYSITELIB}/mitmproxy/addons/eventstore.pyc
+${PYSITELIB}/mitmproxy/addons/eventstore.pyo
+${PYSITELIB}/mitmproxy/addons/export.py
+${PYSITELIB}/mitmproxy/addons/export.pyc
+${PYSITELIB}/mitmproxy/addons/export.pyo
 ${PYSITELIB}/mitmproxy/addons/intercept.py
+${PYSITELIB}/mitmproxy/addons/intercept.pyc
+${PYSITELIB}/mitmproxy/addons/intercept.pyo
+${PYSITELIB}/mitmproxy/addons/keepserving.py
+${PYSITELIB}/mitmproxy/addons/keepserving.pyc
+${PYSITELIB}/mitmproxy/addons/keepserving.pyo
 ${PYSITELIB}/mitmproxy/addons/onboarding.py
+${PYSITELIB}/mitmproxy/addons/onboarding.pyc
+${PYSITELIB}/mitmproxy/addons/onboarding.pyo
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/__init__.py
-${PYSITELIB}/mitmproxy/addons/onboardingapp/__init__.pyo
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/__init__.pyc
-${PYSITELIB}/mitmproxy/addons/onboardingapp/app.pyo
-${PYSITELIB}/mitmproxy/addons/onboardingapp/app.pyc
+${PYSITELIB}/mitmproxy/addons/onboardingapp/__init__.pyo
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/app.py
+${PYSITELIB}/mitmproxy/addons/onboardingapp/app.pyc
+${PYSITELIB}/mitmproxy/addons/onboardingapp/app.pyo
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/bootstrap.min.css
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/fontawesome/css/font-awesome.css
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/fontawesome/css/font-awesome.min.css
@@ -129,399 +81,528 @@ ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/fontawesome/fonts/fontawesome
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/fontawesome/fonts/fontawesome-webfont.svg
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/fontawesome/fonts/fontawesome-webfont.ttf
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/fontawesome/fonts/fontawesome-webfont.woff
+${PYSITELIB}/mitmproxy/addons/onboardingapp/static/images/favicon.ico
+${PYSITELIB}/mitmproxy/addons/onboardingapp/static/images/mitmproxy-long.png
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/static/mitmproxy.css
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/templates/frame.html
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/templates/index.html
 ${PYSITELIB}/mitmproxy/addons/onboardingapp/templates/layout.html
 ${PYSITELIB}/mitmproxy/addons/proxyauth.py
+${PYSITELIB}/mitmproxy/addons/proxyauth.pyc
+${PYSITELIB}/mitmproxy/addons/proxyauth.pyo
+${PYSITELIB}/mitmproxy/addons/readfile.py
+${PYSITELIB}/mitmproxy/addons/readfile.pyc
+${PYSITELIB}/mitmproxy/addons/readfile.pyo
 ${PYSITELIB}/mitmproxy/addons/replace.py
+${PYSITELIB}/mitmproxy/addons/replace.pyc
+${PYSITELIB}/mitmproxy/addons/replace.pyo
+${PYSITELIB}/mitmproxy/addons/save.py
+${PYSITELIB}/mitmproxy/addons/save.pyc
+${PYSITELIB}/mitmproxy/addons/save.pyo
 ${PYSITELIB}/mitmproxy/addons/script.py
+${PYSITELIB}/mitmproxy/addons/script.pyc
+${PYSITELIB}/mitmproxy/addons/script.pyo
 ${PYSITELIB}/mitmproxy/addons/serverplayback.py
+${PYSITELIB}/mitmproxy/addons/serverplayback.pyc
+${PYSITELIB}/mitmproxy/addons/serverplayback.pyo
 ${PYSITELIB}/mitmproxy/addons/setheaders.py
+${PYSITELIB}/mitmproxy/addons/setheaders.pyc
+${PYSITELIB}/mitmproxy/addons/setheaders.pyo
 ${PYSITELIB}/mitmproxy/addons/stickyauth.py
+${PYSITELIB}/mitmproxy/addons/stickyauth.pyc
+${PYSITELIB}/mitmproxy/addons/stickyauth.pyo
 ${PYSITELIB}/mitmproxy/addons/stickycookie.py
+${PYSITELIB}/mitmproxy/addons/stickycookie.pyc
+${PYSITELIB}/mitmproxy/addons/stickycookie.pyo
 ${PYSITELIB}/mitmproxy/addons/streambodies.py
-${PYSITELIB}/mitmproxy/addons/streamfile.py
+${PYSITELIB}/mitmproxy/addons/streambodies.pyc
+${PYSITELIB}/mitmproxy/addons/streambodies.pyo
 ${PYSITELIB}/mitmproxy/addons/termlog.py
+${PYSITELIB}/mitmproxy/addons/termlog.pyc
+${PYSITELIB}/mitmproxy/addons/termlog.pyo
+${PYSITELIB}/mitmproxy/addons/termstatus.py
+${PYSITELIB}/mitmproxy/addons/termstatus.pyc
+${PYSITELIB}/mitmproxy/addons/termstatus.pyo
 ${PYSITELIB}/mitmproxy/addons/upstream_auth.py
+${PYSITELIB}/mitmproxy/addons/upstream_auth.pyc
+${PYSITELIB}/mitmproxy/addons/upstream_auth.pyo
 ${PYSITELIB}/mitmproxy/addons/view.py
+${PYSITELIB}/mitmproxy/addons/view.pyc
+${PYSITELIB}/mitmproxy/addons/view.pyo
 ${PYSITELIB}/mitmproxy/addons/wsgiapp.py
+${PYSITELIB}/mitmproxy/addons/wsgiapp.pyc
+${PYSITELIB}/mitmproxy/addons/wsgiapp.pyo
 ${PYSITELIB}/mitmproxy/certs.py
+${PYSITELIB}/mitmproxy/certs.pyc
+${PYSITELIB}/mitmproxy/certs.pyo
+${PYSITELIB}/mitmproxy/command.py
+${PYSITELIB}/mitmproxy/command.pyc
+${PYSITELIB}/mitmproxy/command.pyo
 ${PYSITELIB}/mitmproxy/connections.py
+${PYSITELIB}/mitmproxy/connections.pyc
+${PYSITELIB}/mitmproxy/connections.pyo
 ${PYSITELIB}/mitmproxy/contentviews/__init__.py
-${PYSITELIB}/mitmproxy/contentviews/__init__.pyo
 ${PYSITELIB}/mitmproxy/contentviews/__init__.pyc
-${PYSITELIB}/mitmproxy/contentviews/auto.pyo
-${PYSITELIB}/mitmproxy/contentviews/auto.pyc
-${PYSITELIB}/mitmproxy/contentviews/base.pyo
-${PYSITELIB}/mitmproxy/contentviews/base.pyc
-${PYSITELIB}/mitmproxy/contentviews/css.pyo
-${PYSITELIB}/mitmproxy/contentviews/css.pyc
-${PYSITELIB}/mitmproxy/contentviews/hex.pyo
-${PYSITELIB}/mitmproxy/contentviews/hex.pyc
-${PYSITELIB}/mitmproxy/contentviews/html_outline.pyo
-${PYSITELIB}/mitmproxy/contentviews/html_outline.pyc
-${PYSITELIB}/mitmproxy/contentviews/javascript.pyo
-${PYSITELIB}/mitmproxy/contentviews/javascript.pyc
-${PYSITELIB}/mitmproxy/contentviews/json.pyo
-${PYSITELIB}/mitmproxy/contentviews/json.pyc
-${PYSITELIB}/mitmproxy/contentviews/multipart.pyo
-${PYSITELIB}/mitmproxy/contentviews/multipart.pyc
-${PYSITELIB}/mitmproxy/contentviews/protobuf.pyo
-${PYSITELIB}/mitmproxy/contentviews/protobuf.pyc
-${PYSITELIB}/mitmproxy/contentviews/query.pyo
-${PYSITELIB}/mitmproxy/contentviews/query.pyc
-${PYSITELIB}/mitmproxy/contentviews/raw.pyo
-${PYSITELIB}/mitmproxy/contentviews/raw.pyc
-${PYSITELIB}/mitmproxy/contentviews/urlencoded.pyo
-${PYSITELIB}/mitmproxy/contentviews/urlencoded.pyc
-${PYSITELIB}/mitmproxy/contentviews/wbxml.pyo
-${PYSITELIB}/mitmproxy/contentviews/wbxml.pyc
-${PYSITELIB}/mitmproxy/contentviews/xml_html.pyo
-${PYSITELIB}/mitmproxy/contentviews/xml_html.pyc
+${PYSITELIB}/mitmproxy/contentviews/__init__.pyo
 ${PYSITELIB}/mitmproxy/contentviews/auto.py
+${PYSITELIB}/mitmproxy/contentviews/auto.pyc
+${PYSITELIB}/mitmproxy/contentviews/auto.pyo
 ${PYSITELIB}/mitmproxy/contentviews/base.py
+${PYSITELIB}/mitmproxy/contentviews/base.pyc
+${PYSITELIB}/mitmproxy/contentviews/base.pyo
 ${PYSITELIB}/mitmproxy/contentviews/css.py
+${PYSITELIB}/mitmproxy/contentviews/css.pyc
+${PYSITELIB}/mitmproxy/contentviews/css.pyo
 ${PYSITELIB}/mitmproxy/contentviews/hex.py
-${PYSITELIB}/mitmproxy/contentviews/html_outline.py
+${PYSITELIB}/mitmproxy/contentviews/hex.pyc
+${PYSITELIB}/mitmproxy/contentviews/hex.pyo
 ${PYSITELIB}/mitmproxy/contentviews/image/__init__.py
-${PYSITELIB}/mitmproxy/contentviews/image/__init__.pyo
 ${PYSITELIB}/mitmproxy/contentviews/image/__init__.pyc
-${PYSITELIB}/mitmproxy/contentviews/image/image_parser.pyo
-${PYSITELIB}/mitmproxy/contentviews/image/image_parser.pyc
-${PYSITELIB}/mitmproxy/contentviews/image/view.pyo
-${PYSITELIB}/mitmproxy/contentviews/image/view.pyc
+${PYSITELIB}/mitmproxy/contentviews/image/__init__.pyo
 ${PYSITELIB}/mitmproxy/contentviews/image/image_parser.py
+${PYSITELIB}/mitmproxy/contentviews/image/image_parser.pyc
+${PYSITELIB}/mitmproxy/contentviews/image/image_parser.pyo
 ${PYSITELIB}/mitmproxy/contentviews/image/view.py
+${PYSITELIB}/mitmproxy/contentviews/image/view.pyc
+${PYSITELIB}/mitmproxy/contentviews/image/view.pyo
 ${PYSITELIB}/mitmproxy/contentviews/javascript.py
+${PYSITELIB}/mitmproxy/contentviews/javascript.pyc
+${PYSITELIB}/mitmproxy/contentviews/javascript.pyo
 ${PYSITELIB}/mitmproxy/contentviews/json.py
+${PYSITELIB}/mitmproxy/contentviews/json.pyc
+${PYSITELIB}/mitmproxy/contentviews/json.pyo
 ${PYSITELIB}/mitmproxy/contentviews/multipart.py
+${PYSITELIB}/mitmproxy/contentviews/multipart.pyc
+${PYSITELIB}/mitmproxy/contentviews/multipart.pyo
 ${PYSITELIB}/mitmproxy/contentviews/protobuf.py
+${PYSITELIB}/mitmproxy/contentviews/protobuf.pyc
+${PYSITELIB}/mitmproxy/contentviews/protobuf.pyo
 ${PYSITELIB}/mitmproxy/contentviews/query.py
+${PYSITELIB}/mitmproxy/contentviews/query.pyc
+${PYSITELIB}/mitmproxy/contentviews/query.pyo
 ${PYSITELIB}/mitmproxy/contentviews/raw.py
+${PYSITELIB}/mitmproxy/contentviews/raw.pyc
+${PYSITELIB}/mitmproxy/contentviews/raw.pyo
 ${PYSITELIB}/mitmproxy/contentviews/urlencoded.py
+${PYSITELIB}/mitmproxy/contentviews/urlencoded.pyc
+${PYSITELIB}/mitmproxy/contentviews/urlencoded.pyo
 ${PYSITELIB}/mitmproxy/contentviews/wbxml.py
+${PYSITELIB}/mitmproxy/contentviews/wbxml.pyc
+${PYSITELIB}/mitmproxy/contentviews/wbxml.pyo
 ${PYSITELIB}/mitmproxy/contentviews/xml_html.py
+${PYSITELIB}/mitmproxy/contentviews/xml_html.pyc
+${PYSITELIB}/mitmproxy/contentviews/xml_html.pyo
 ${PYSITELIB}/mitmproxy/contrib/README
 ${PYSITELIB}/mitmproxy/contrib/__init__.py
-${PYSITELIB}/mitmproxy/contrib/__init__.pyo
 ${PYSITELIB}/mitmproxy/contrib/__init__.pyc
-${PYSITELIB}/mitmproxy/contrib/tls_parser.pyo
-${PYSITELIB}/mitmproxy/contrib/tls_parser.pyc
-${PYSITELIB}/mitmproxy/contrib/tnetstring.pyo
-${PYSITELIB}/mitmproxy/contrib/tnetstring.pyc
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif.pyo
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif.pyc
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_be.pyo
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_be.pyc
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_le.pyo
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_le.pyc
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/gif.pyo
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/gif.pyc
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/jpeg.pyo
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/jpeg.pyc
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/png.pyo
-${PYSITELIB}/mitmproxy/contrib/kaitaistruct/png.pyc
+${PYSITELIB}/mitmproxy/contrib/__init__.pyo
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif.pyo
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_be.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_be.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_be.pyo
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_le.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_le.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/exif_le.pyo
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/gif.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/gif.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/gif.pyo
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/google_protobuf.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/google_protobuf.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/google_protobuf.pyo
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/ico.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/ico.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/ico.pyo
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/jpeg.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/jpeg.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/jpeg.pyo
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/make.sh
 ${PYSITELIB}/mitmproxy/contrib/kaitaistruct/png.py
-${PYSITELIB}/mitmproxy/contrib/tls_parser.py
-${PYSITELIB}/mitmproxy/contrib/tnetstring.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/png.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/png.pyo
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/tls_client_hello.ksy
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/tls_client_hello.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/tls_client_hello.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/tls_client_hello.pyo
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/vlq_base128_le.py
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/vlq_base128_le.pyc
+${PYSITELIB}/mitmproxy/contrib/kaitaistruct/vlq_base128_le.pyo
 ${PYSITELIB}/mitmproxy/contrib/wbxml/ASCommandResponse.py
-${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXML.py
-${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py
-${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py
-${PYSITELIB}/mitmproxy/contrib/wbxml/GlobalTokens.py
-${PYSITELIB}/mitmproxy/contrib/wbxml/InvalidDataException.py
-${PYSITELIB}/mitmproxy/contrib/wbxml/__init__.py
-${PYSITELIB}/mitmproxy/contrib/wbxml/ASCommandResponse.pyo
 ${PYSITELIB}/mitmproxy/contrib/wbxml/ASCommandResponse.pyc
-${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXML.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/ASCommandResponse.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXML.py
 ${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXML.pyc
-${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXML.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.py
 ${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.pyc
-${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLCodePage.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLByteQueue.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py
 ${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLCodePage.pyc
-${PYSITELIB}/mitmproxy/contrib/wbxml/GlobalTokens.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/ASWBXMLCodePage.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/GlobalTokens.py
 ${PYSITELIB}/mitmproxy/contrib/wbxml/GlobalTokens.pyc
-${PYSITELIB}/mitmproxy/contrib/wbxml/InvalidDataException.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/GlobalTokens.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/InvalidDataException.py
 ${PYSITELIB}/mitmproxy/contrib/wbxml/InvalidDataException.pyc
-${PYSITELIB}/mitmproxy/contrib/wbxml/__init__.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/InvalidDataException.pyo
+${PYSITELIB}/mitmproxy/contrib/wbxml/__init__.py
 ${PYSITELIB}/mitmproxy/contrib/wbxml/__init__.pyc
+${PYSITELIB}/mitmproxy/contrib/wbxml/__init__.pyo
 ${PYSITELIB}/mitmproxy/controller.py
+${PYSITELIB}/mitmproxy/controller.pyc
+${PYSITELIB}/mitmproxy/controller.pyo
+${PYSITELIB}/mitmproxy/coretypes/__init__.py
+${PYSITELIB}/mitmproxy/coretypes/__init__.pyc
+${PYSITELIB}/mitmproxy/coretypes/__init__.pyo
+${PYSITELIB}/mitmproxy/coretypes/basethread.py
+${PYSITELIB}/mitmproxy/coretypes/basethread.pyc
+${PYSITELIB}/mitmproxy/coretypes/basethread.pyo
+${PYSITELIB}/mitmproxy/coretypes/bidi.py
+${PYSITELIB}/mitmproxy/coretypes/bidi.pyc
+${PYSITELIB}/mitmproxy/coretypes/bidi.pyo
+${PYSITELIB}/mitmproxy/coretypes/multidict.py
+${PYSITELIB}/mitmproxy/coretypes/multidict.pyc
+${PYSITELIB}/mitmproxy/coretypes/multidict.pyo
+${PYSITELIB}/mitmproxy/coretypes/serializable.py
+${PYSITELIB}/mitmproxy/coretypes/serializable.pyc
+${PYSITELIB}/mitmproxy/coretypes/serializable.pyo
 ${PYSITELIB}/mitmproxy/ctx.py
+${PYSITELIB}/mitmproxy/ctx.pyc
+${PYSITELIB}/mitmproxy/ctx.pyo
 ${PYSITELIB}/mitmproxy/eventsequence.py
+${PYSITELIB}/mitmproxy/eventsequence.pyc
+${PYSITELIB}/mitmproxy/eventsequence.pyo
 ${PYSITELIB}/mitmproxy/exceptions.py
-${PYSITELIB}/mitmproxy/export.py
+${PYSITELIB}/mitmproxy/exceptions.pyc
+${PYSITELIB}/mitmproxy/exceptions.pyo
 ${PYSITELIB}/mitmproxy/flow.py
+${PYSITELIB}/mitmproxy/flow.pyc
+${PYSITELIB}/mitmproxy/flow.pyo
 ${PYSITELIB}/mitmproxy/flowfilter.py
+${PYSITELIB}/mitmproxy/flowfilter.pyc
+${PYSITELIB}/mitmproxy/flowfilter.pyo
 ${PYSITELIB}/mitmproxy/http.py
-${PYSITELIB}/mitmproxy/io.py
-${PYSITELIB}/mitmproxy/io_compat.py
+${PYSITELIB}/mitmproxy/http.pyc
+${PYSITELIB}/mitmproxy/http.pyo
+${PYSITELIB}/mitmproxy/io/__init__.py
+${PYSITELIB}/mitmproxy/io/__init__.pyc
+${PYSITELIB}/mitmproxy/io/__init__.pyo
+${PYSITELIB}/mitmproxy/io/compat.py
+${PYSITELIB}/mitmproxy/io/compat.pyc
+${PYSITELIB}/mitmproxy/io/compat.pyo
+${PYSITELIB}/mitmproxy/io/io.py
+${PYSITELIB}/mitmproxy/io/io.pyc
+${PYSITELIB}/mitmproxy/io/io.pyo
+${PYSITELIB}/mitmproxy/io/tnetstring.py
+${PYSITELIB}/mitmproxy/io/tnetstring.pyc
+${PYSITELIB}/mitmproxy/io/tnetstring.pyo
 ${PYSITELIB}/mitmproxy/log.py
+${PYSITELIB}/mitmproxy/log.pyc
+${PYSITELIB}/mitmproxy/log.pyo
 ${PYSITELIB}/mitmproxy/master.py
+${PYSITELIB}/mitmproxy/master.pyc
+${PYSITELIB}/mitmproxy/master.pyo
 ${PYSITELIB}/mitmproxy/net/__init__.py
-${PYSITELIB}/mitmproxy/net/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/__init__.pyc
-${PYSITELIB}/mitmproxy/net/check.pyo
-${PYSITELIB}/mitmproxy/net/check.pyc
-${PYSITELIB}/mitmproxy/net/socks.pyo
-${PYSITELIB}/mitmproxy/net/socks.pyc
-${PYSITELIB}/mitmproxy/net/tcp.pyo
-${PYSITELIB}/mitmproxy/net/tcp.pyc
-${PYSITELIB}/mitmproxy/net/wsgi.pyo
-${PYSITELIB}/mitmproxy/net/wsgi.pyc
+${PYSITELIB}/mitmproxy/net/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/check.py
+${PYSITELIB}/mitmproxy/net/check.pyc
+${PYSITELIB}/mitmproxy/net/check.pyo
 ${PYSITELIB}/mitmproxy/net/http/__init__.py
-${PYSITELIB}/mitmproxy/net/http/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/http/__init__.pyc
-${PYSITELIB}/mitmproxy/net/http/cookies.pyo
-${PYSITELIB}/mitmproxy/net/http/cookies.pyc
-${PYSITELIB}/mitmproxy/net/http/encoding.pyo
-${PYSITELIB}/mitmproxy/net/http/encoding.pyc
-${PYSITELIB}/mitmproxy/net/http/headers.pyo
-${PYSITELIB}/mitmproxy/net/http/headers.pyc
-${PYSITELIB}/mitmproxy/net/http/message.pyo
-${PYSITELIB}/mitmproxy/net/http/message.pyc
-${PYSITELIB}/mitmproxy/net/http/multipart.pyo
-${PYSITELIB}/mitmproxy/net/http/multipart.pyc
-${PYSITELIB}/mitmproxy/net/http/request.pyo
-${PYSITELIB}/mitmproxy/net/http/request.pyc
-${PYSITELIB}/mitmproxy/net/http/response.pyo
-${PYSITELIB}/mitmproxy/net/http/response.pyc
-${PYSITELIB}/mitmproxy/net/http/status_codes.pyo
-${PYSITELIB}/mitmproxy/net/http/status_codes.pyc
-${PYSITELIB}/mitmproxy/net/http/url.pyo
-${PYSITELIB}/mitmproxy/net/http/url.pyc
-${PYSITELIB}/mitmproxy/net/http/user_agents.pyo
-${PYSITELIB}/mitmproxy/net/http/user_agents.pyc
+${PYSITELIB}/mitmproxy/net/http/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/http/cookies.py
+${PYSITELIB}/mitmproxy/net/http/cookies.pyc
+${PYSITELIB}/mitmproxy/net/http/cookies.pyo
 ${PYSITELIB}/mitmproxy/net/http/encoding.py
+${PYSITELIB}/mitmproxy/net/http/encoding.pyc
+${PYSITELIB}/mitmproxy/net/http/encoding.pyo
 ${PYSITELIB}/mitmproxy/net/http/headers.py
+${PYSITELIB}/mitmproxy/net/http/headers.pyc
+${PYSITELIB}/mitmproxy/net/http/headers.pyo
 ${PYSITELIB}/mitmproxy/net/http/http1/__init__.py
-${PYSITELIB}/mitmproxy/net/http/http1/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/http/http1/__init__.pyc
-${PYSITELIB}/mitmproxy/net/http/http1/assemble.pyo
-${PYSITELIB}/mitmproxy/net/http/http1/assemble.pyc
-${PYSITELIB}/mitmproxy/net/http/http1/read.pyo
-${PYSITELIB}/mitmproxy/net/http/http1/read.pyc
+${PYSITELIB}/mitmproxy/net/http/http1/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/http/http1/assemble.py
+${PYSITELIB}/mitmproxy/net/http/http1/assemble.pyc
+${PYSITELIB}/mitmproxy/net/http/http1/assemble.pyo
 ${PYSITELIB}/mitmproxy/net/http/http1/read.py
+${PYSITELIB}/mitmproxy/net/http/http1/read.pyc
+${PYSITELIB}/mitmproxy/net/http/http1/read.pyo
 ${PYSITELIB}/mitmproxy/net/http/http2/__init__.py
-${PYSITELIB}/mitmproxy/net/http/http2/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/http/http2/__init__.pyc
-${PYSITELIB}/mitmproxy/net/http/http2/framereader.pyo
-${PYSITELIB}/mitmproxy/net/http/http2/framereader.pyc
-${PYSITELIB}/mitmproxy/net/http/http2/utils.pyo
-${PYSITELIB}/mitmproxy/net/http/http2/utils.pyc
+${PYSITELIB}/mitmproxy/net/http/http2/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/http/http2/framereader.py
+${PYSITELIB}/mitmproxy/net/http/http2/framereader.pyc
+${PYSITELIB}/mitmproxy/net/http/http2/framereader.pyo
 ${PYSITELIB}/mitmproxy/net/http/http2/utils.py
+${PYSITELIB}/mitmproxy/net/http/http2/utils.pyc
+${PYSITELIB}/mitmproxy/net/http/http2/utils.pyo
 ${PYSITELIB}/mitmproxy/net/http/message.py
+${PYSITELIB}/mitmproxy/net/http/message.pyc
+${PYSITELIB}/mitmproxy/net/http/message.pyo
 ${PYSITELIB}/mitmproxy/net/http/multipart.py
+${PYSITELIB}/mitmproxy/net/http/multipart.pyc
+${PYSITELIB}/mitmproxy/net/http/multipart.pyo
 ${PYSITELIB}/mitmproxy/net/http/request.py
+${PYSITELIB}/mitmproxy/net/http/request.pyc
+${PYSITELIB}/mitmproxy/net/http/request.pyo
 ${PYSITELIB}/mitmproxy/net/http/response.py
+${PYSITELIB}/mitmproxy/net/http/response.pyc
+${PYSITELIB}/mitmproxy/net/http/response.pyo
 ${PYSITELIB}/mitmproxy/net/http/status_codes.py
+${PYSITELIB}/mitmproxy/net/http/status_codes.pyc
+${PYSITELIB}/mitmproxy/net/http/status_codes.pyo
 ${PYSITELIB}/mitmproxy/net/http/url.py
+${PYSITELIB}/mitmproxy/net/http/url.pyc
+${PYSITELIB}/mitmproxy/net/http/url.pyo
 ${PYSITELIB}/mitmproxy/net/http/user_agents.py
+${PYSITELIB}/mitmproxy/net/http/user_agents.pyc
+${PYSITELIB}/mitmproxy/net/http/user_agents.pyo
+${PYSITELIB}/mitmproxy/net/server_spec.py
+${PYSITELIB}/mitmproxy/net/server_spec.pyc
+${PYSITELIB}/mitmproxy/net/server_spec.pyo
 ${PYSITELIB}/mitmproxy/net/socks.py
+${PYSITELIB}/mitmproxy/net/socks.pyc
+${PYSITELIB}/mitmproxy/net/socks.pyo
 ${PYSITELIB}/mitmproxy/net/tcp.py
+${PYSITELIB}/mitmproxy/net/tcp.pyc
+${PYSITELIB}/mitmproxy/net/tcp.pyo
+${PYSITELIB}/mitmproxy/net/tls.py
+${PYSITELIB}/mitmproxy/net/tls.pyc
+${PYSITELIB}/mitmproxy/net/tls.pyo
 ${PYSITELIB}/mitmproxy/net/websockets/__init__.py
-${PYSITELIB}/mitmproxy/net/websockets/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/websockets/__init__.pyc
-${PYSITELIB}/mitmproxy/net/websockets/frame.pyo
-${PYSITELIB}/mitmproxy/net/websockets/frame.pyc
-${PYSITELIB}/mitmproxy/net/websockets/masker.pyo
-${PYSITELIB}/mitmproxy/net/websockets/masker.pyc
-${PYSITELIB}/mitmproxy/net/websockets/utils.pyo
-${PYSITELIB}/mitmproxy/net/websockets/utils.pyc
+${PYSITELIB}/mitmproxy/net/websockets/__init__.pyo
 ${PYSITELIB}/mitmproxy/net/websockets/frame.py
+${PYSITELIB}/mitmproxy/net/websockets/frame.pyc
+${PYSITELIB}/mitmproxy/net/websockets/frame.pyo
 ${PYSITELIB}/mitmproxy/net/websockets/masker.py
+${PYSITELIB}/mitmproxy/net/websockets/masker.pyc
+${PYSITELIB}/mitmproxy/net/websockets/masker.pyo
 ${PYSITELIB}/mitmproxy/net/websockets/utils.py
+${PYSITELIB}/mitmproxy/net/websockets/utils.pyc
+${PYSITELIB}/mitmproxy/net/websockets/utils.pyo
 ${PYSITELIB}/mitmproxy/net/wsgi.py
+${PYSITELIB}/mitmproxy/net/wsgi.pyc
+${PYSITELIB}/mitmproxy/net/wsgi.pyo
 ${PYSITELIB}/mitmproxy/options.py
+${PYSITELIB}/mitmproxy/options.pyc
+${PYSITELIB}/mitmproxy/options.pyo
 ${PYSITELIB}/mitmproxy/optmanager.py
+${PYSITELIB}/mitmproxy/optmanager.pyc
+${PYSITELIB}/mitmproxy/optmanager.pyo
 ${PYSITELIB}/mitmproxy/platform/__init__.py
-${PYSITELIB}/mitmproxy/platform/__init__.pyo
 ${PYSITELIB}/mitmproxy/platform/__init__.pyc
-${PYSITELIB}/mitmproxy/platform/linux.pyo
-${PYSITELIB}/mitmproxy/platform/linux.pyc
-${PYSITELIB}/mitmproxy/platform/openbsd.pyo
-${PYSITELIB}/mitmproxy/platform/openbsd.pyc
-${PYSITELIB}/mitmproxy/platform/osx.pyo
-${PYSITELIB}/mitmproxy/platform/osx.pyc
-${PYSITELIB}/mitmproxy/platform/pf.pyo
-${PYSITELIB}/mitmproxy/platform/pf.pyc
-${PYSITELIB}/mitmproxy/platform/windows.pyo
-${PYSITELIB}/mitmproxy/platform/windows.pyc
+${PYSITELIB}/mitmproxy/platform/__init__.pyo
 ${PYSITELIB}/mitmproxy/platform/linux.py
+${PYSITELIB}/mitmproxy/platform/linux.pyc
+${PYSITELIB}/mitmproxy/platform/linux.pyo
 ${PYSITELIB}/mitmproxy/platform/openbsd.py
+${PYSITELIB}/mitmproxy/platform/openbsd.pyc
+${PYSITELIB}/mitmproxy/platform/openbsd.pyo
 ${PYSITELIB}/mitmproxy/platform/osx.py
+${PYSITELIB}/mitmproxy/platform/osx.pyc
+${PYSITELIB}/mitmproxy/platform/osx.pyo
 ${PYSITELIB}/mitmproxy/platform/pf.py
+${PYSITELIB}/mitmproxy/platform/pf.pyc
+${PYSITELIB}/mitmproxy/platform/pf.pyo
 ${PYSITELIB}/mitmproxy/platform/windows.py
+${PYSITELIB}/mitmproxy/platform/windows.pyc
+${PYSITELIB}/mitmproxy/platform/windows.pyo
 ${PYSITELIB}/mitmproxy/proxy/__init__.py
-${PYSITELIB}/mitmproxy/proxy/__init__.pyo
 ${PYSITELIB}/mitmproxy/proxy/__init__.pyc
-${PYSITELIB}/mitmproxy/proxy/config.pyo
-${PYSITELIB}/mitmproxy/proxy/config.pyc
-${PYSITELIB}/mitmproxy/proxy/root_context.pyo
-${PYSITELIB}/mitmproxy/proxy/root_context.pyc
-${PYSITELIB}/mitmproxy/proxy/server.pyo
-${PYSITELIB}/mitmproxy/proxy/server.pyc
+${PYSITELIB}/mitmproxy/proxy/__init__.pyo
 ${PYSITELIB}/mitmproxy/proxy/config.py
+${PYSITELIB}/mitmproxy/proxy/config.pyc
+${PYSITELIB}/mitmproxy/proxy/config.pyo
 ${PYSITELIB}/mitmproxy/proxy/modes/__init__.py
-${PYSITELIB}/mitmproxy/proxy/modes/__init__.pyo
 ${PYSITELIB}/mitmproxy/proxy/modes/__init__.pyc
-${PYSITELIB}/mitmproxy/proxy/modes/http_proxy.pyo
-${PYSITELIB}/mitmproxy/proxy/modes/http_proxy.pyc
-${PYSITELIB}/mitmproxy/proxy/modes/reverse_proxy.pyo
-${PYSITELIB}/mitmproxy/proxy/modes/reverse_proxy.pyc
-${PYSITELIB}/mitmproxy/proxy/modes/socks_proxy.pyo
-${PYSITELIB}/mitmproxy/proxy/modes/socks_proxy.pyc
-${PYSITELIB}/mitmproxy/proxy/modes/transparent_proxy.pyo
-${PYSITELIB}/mitmproxy/proxy/modes/transparent_proxy.pyc
+${PYSITELIB}/mitmproxy/proxy/modes/__init__.pyo
 ${PYSITELIB}/mitmproxy/proxy/modes/http_proxy.py
+${PYSITELIB}/mitmproxy/proxy/modes/http_proxy.pyc
+${PYSITELIB}/mitmproxy/proxy/modes/http_proxy.pyo
 ${PYSITELIB}/mitmproxy/proxy/modes/reverse_proxy.py
+${PYSITELIB}/mitmproxy/proxy/modes/reverse_proxy.pyc
+${PYSITELIB}/mitmproxy/proxy/modes/reverse_proxy.pyo
 ${PYSITELIB}/mitmproxy/proxy/modes/socks_proxy.py
+${PYSITELIB}/mitmproxy/proxy/modes/socks_proxy.pyc
+${PYSITELIB}/mitmproxy/proxy/modes/socks_proxy.pyo
 ${PYSITELIB}/mitmproxy/proxy/modes/transparent_proxy.py
+${PYSITELIB}/mitmproxy/proxy/modes/transparent_proxy.pyc
+${PYSITELIB}/mitmproxy/proxy/modes/transparent_proxy.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/__init__.py
-${PYSITELIB}/mitmproxy/proxy/protocol/__init__.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/__init__.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/base.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/base.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/http.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/http.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/http1.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/http1.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/http2.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/http2.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/http_replay.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/http_replay.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/tls.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/tls.pyc
-${PYSITELIB}/mitmproxy/proxy/protocol/websocket.pyo
-${PYSITELIB}/mitmproxy/proxy/protocol/websocket.pyc
+${PYSITELIB}/mitmproxy/proxy/protocol/__init__.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/base.py
+${PYSITELIB}/mitmproxy/proxy/protocol/base.pyc
+${PYSITELIB}/mitmproxy/proxy/protocol/base.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/http.py
+${PYSITELIB}/mitmproxy/proxy/protocol/http.pyc
+${PYSITELIB}/mitmproxy/proxy/protocol/http.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/http1.py
+${PYSITELIB}/mitmproxy/proxy/protocol/http1.pyc
+${PYSITELIB}/mitmproxy/proxy/protocol/http1.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/http2.py
+${PYSITELIB}/mitmproxy/proxy/protocol/http2.pyc
+${PYSITELIB}/mitmproxy/proxy/protocol/http2.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/http_replay.py
+${PYSITELIB}/mitmproxy/proxy/protocol/http_replay.pyc
+${PYSITELIB}/mitmproxy/proxy/protocol/http_replay.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.py
+${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.pyc
+${PYSITELIB}/mitmproxy/proxy/protocol/rawtcp.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/tls.py
+${PYSITELIB}/mitmproxy/proxy/protocol/tls.pyc
+${PYSITELIB}/mitmproxy/proxy/protocol/tls.pyo
 ${PYSITELIB}/mitmproxy/proxy/protocol/websocket.py
+${PYSITELIB}/mitmproxy/proxy/protocol/websocket.pyc
+${PYSITELIB}/mitmproxy/proxy/protocol/websocket.pyo
 ${PYSITELIB}/mitmproxy/proxy/root_context.py
+${PYSITELIB}/mitmproxy/proxy/root_context.pyc
+${PYSITELIB}/mitmproxy/proxy/root_context.pyo
 ${PYSITELIB}/mitmproxy/proxy/server.py
+${PYSITELIB}/mitmproxy/proxy/server.pyc
+${PYSITELIB}/mitmproxy/proxy/server.pyo
 ${PYSITELIB}/mitmproxy/script/__init__.py
-${PYSITELIB}/mitmproxy/script/__init__.pyo
 ${PYSITELIB}/mitmproxy/script/__init__.pyc
-${PYSITELIB}/mitmproxy/script/concurrent.pyo
-${PYSITELIB}/mitmproxy/script/concurrent.pyc
+${PYSITELIB}/mitmproxy/script/__init__.pyo
 ${PYSITELIB}/mitmproxy/script/concurrent.py
+${PYSITELIB}/mitmproxy/script/concurrent.pyc
+${PYSITELIB}/mitmproxy/script/concurrent.pyo
 ${PYSITELIB}/mitmproxy/stateobject.py
+${PYSITELIB}/mitmproxy/stateobject.pyc
+${PYSITELIB}/mitmproxy/stateobject.pyo
 ${PYSITELIB}/mitmproxy/tcp.py
-${PYSITELIB}/mitmproxy/test/taddons.pyo
-${PYSITELIB}/mitmproxy/test/taddons.pyc
-${PYSITELIB}/mitmproxy/test/tflow.pyo
-${PYSITELIB}/mitmproxy/test/tflow.pyc
-${PYSITELIB}/mitmproxy/test/tutils.pyo
-${PYSITELIB}/mitmproxy/test/tutils.pyc
+${PYSITELIB}/mitmproxy/tcp.pyc
+${PYSITELIB}/mitmproxy/tcp.pyo
 ${PYSITELIB}/mitmproxy/test/taddons.py
+${PYSITELIB}/mitmproxy/test/taddons.pyc
+${PYSITELIB}/mitmproxy/test/taddons.pyo
 ${PYSITELIB}/mitmproxy/test/tflow.py
+${PYSITELIB}/mitmproxy/test/tflow.pyc
+${PYSITELIB}/mitmproxy/test/tflow.pyo
 ${PYSITELIB}/mitmproxy/test/tutils.py
+${PYSITELIB}/mitmproxy/test/tutils.pyc
+${PYSITELIB}/mitmproxy/test/tutils.pyo
 ${PYSITELIB}/mitmproxy/tools/__init__.py
-${PYSITELIB}/mitmproxy/tools/__init__.pyo
 ${PYSITELIB}/mitmproxy/tools/__init__.pyc
-${PYSITELIB}/mitmproxy/tools/cmdline.pyo
-${PYSITELIB}/mitmproxy/tools/cmdline.pyc
-${PYSITELIB}/mitmproxy/tools/dump.pyo
-${PYSITELIB}/mitmproxy/tools/dump.pyc
-${PYSITELIB}/mitmproxy/tools/main.pyo
-${PYSITELIB}/mitmproxy/tools/main.pyc
+${PYSITELIB}/mitmproxy/tools/__init__.pyo
 ${PYSITELIB}/mitmproxy/tools/cmdline.py
+${PYSITELIB}/mitmproxy/tools/cmdline.pyc
+${PYSITELIB}/mitmproxy/tools/cmdline.pyo
 ${PYSITELIB}/mitmproxy/tools/console/__init__.py
-${PYSITELIB}/mitmproxy/tools/console/__init__.pyo
 ${PYSITELIB}/mitmproxy/tools/console/__init__.pyc
-${PYSITELIB}/mitmproxy/tools/console/common.pyo
-${PYSITELIB}/mitmproxy/tools/console/common.pyc
-${PYSITELIB}/mitmproxy/tools/console/flowdetailview.pyo
-${PYSITELIB}/mitmproxy/tools/console/flowdetailview.pyc
-${PYSITELIB}/mitmproxy/tools/console/flowlist.pyo
-${PYSITELIB}/mitmproxy/tools/console/flowlist.pyc
-${PYSITELIB}/mitmproxy/tools/console/flowview.pyo
-${PYSITELIB}/mitmproxy/tools/console/flowview.pyc
-${PYSITELIB}/mitmproxy/tools/console/help.pyo
-${PYSITELIB}/mitmproxy/tools/console/help.pyc
-${PYSITELIB}/mitmproxy/tools/console/master.pyo
-${PYSITELIB}/mitmproxy/tools/console/master.pyc
-${PYSITELIB}/mitmproxy/tools/console/options.pyo
-${PYSITELIB}/mitmproxy/tools/console/options.pyc
-${PYSITELIB}/mitmproxy/tools/console/palettepicker.pyo
-${PYSITELIB}/mitmproxy/tools/console/palettepicker.pyc
-${PYSITELIB}/mitmproxy/tools/console/palettes.pyo
-${PYSITELIB}/mitmproxy/tools/console/palettes.pyc
-${PYSITELIB}/mitmproxy/tools/console/pathedit.pyo
-${PYSITELIB}/mitmproxy/tools/console/pathedit.pyc
-${PYSITELIB}/mitmproxy/tools/console/searchable.pyo
-${PYSITELIB}/mitmproxy/tools/console/searchable.pyc
-${PYSITELIB}/mitmproxy/tools/console/select.pyo
-${PYSITELIB}/mitmproxy/tools/console/select.pyc
-${PYSITELIB}/mitmproxy/tools/console/signals.pyo
-${PYSITELIB}/mitmproxy/tools/console/signals.pyc
-${PYSITELIB}/mitmproxy/tools/console/statusbar.pyo
-${PYSITELIB}/mitmproxy/tools/console/statusbar.pyc
-${PYSITELIB}/mitmproxy/tools/console/tabs.pyo
-${PYSITELIB}/mitmproxy/tools/console/tabs.pyc
-${PYSITELIB}/mitmproxy/tools/console/window.pyo
-${PYSITELIB}/mitmproxy/tools/console/window.pyc
+${PYSITELIB}/mitmproxy/tools/console/__init__.pyo
+${PYSITELIB}/mitmproxy/tools/console/commander/__init__.py
+${PYSITELIB}/mitmproxy/tools/console/commander/__init__.pyc
+${PYSITELIB}/mitmproxy/tools/console/commander/__init__.pyo
+${PYSITELIB}/mitmproxy/tools/console/commander/commander.py
+${PYSITELIB}/mitmproxy/tools/console/commander/commander.pyc
+${PYSITELIB}/mitmproxy/tools/console/commander/commander.pyo
+${PYSITELIB}/mitmproxy/tools/console/commandexecutor.py
+${PYSITELIB}/mitmproxy/tools/console/commandexecutor.pyc
+${PYSITELIB}/mitmproxy/tools/console/commandexecutor.pyo
+${PYSITELIB}/mitmproxy/tools/console/commands.py
+${PYSITELIB}/mitmproxy/tools/console/commands.pyc
+${PYSITELIB}/mitmproxy/tools/console/commands.pyo
 ${PYSITELIB}/mitmproxy/tools/console/common.py
+${PYSITELIB}/mitmproxy/tools/console/common.pyc
+${PYSITELIB}/mitmproxy/tools/console/common.pyo
+${PYSITELIB}/mitmproxy/tools/console/consoleaddons.py
+${PYSITELIB}/mitmproxy/tools/console/consoleaddons.pyc
+${PYSITELIB}/mitmproxy/tools/console/consoleaddons.pyo
+${PYSITELIB}/mitmproxy/tools/console/defaultkeys.py
+${PYSITELIB}/mitmproxy/tools/console/defaultkeys.pyc
+${PYSITELIB}/mitmproxy/tools/console/defaultkeys.pyo
+${PYSITELIB}/mitmproxy/tools/console/eventlog.py
+${PYSITELIB}/mitmproxy/tools/console/eventlog.pyc
+${PYSITELIB}/mitmproxy/tools/console/eventlog.pyo
 ${PYSITELIB}/mitmproxy/tools/console/flowdetailview.py
+${PYSITELIB}/mitmproxy/tools/console/flowdetailview.pyc
+${PYSITELIB}/mitmproxy/tools/console/flowdetailview.pyo
 ${PYSITELIB}/mitmproxy/tools/console/flowlist.py
+${PYSITELIB}/mitmproxy/tools/console/flowlist.pyc
+${PYSITELIB}/mitmproxy/tools/console/flowlist.pyo
 ${PYSITELIB}/mitmproxy/tools/console/flowview.py
+${PYSITELIB}/mitmproxy/tools/console/flowview.pyc
+${PYSITELIB}/mitmproxy/tools/console/flowview.pyo
 ${PYSITELIB}/mitmproxy/tools/console/grideditor/__init__.py
-${PYSITELIB}/mitmproxy/tools/console/grideditor/__init__.pyo
 ${PYSITELIB}/mitmproxy/tools/console/grideditor/__init__.pyc
-${PYSITELIB}/mitmproxy/tools/console/grideditor/base.pyo
-${PYSITELIB}/mitmproxy/tools/console/grideditor/base.pyc
-${PYSITELIB}/mitmproxy/tools/console/grideditor/col_bytes.pyo
-${PYSITELIB}/mitmproxy/tools/console/grideditor/col_bytes.pyc
-${PYSITELIB}/mitmproxy/tools/console/grideditor/col_subgrid.pyo
-${PYSITELIB}/mitmproxy/tools/console/grideditor/col_subgrid.pyc
-${PYSITELIB}/mitmproxy/tools/console/grideditor/col_text.pyo
-${PYSITELIB}/mitmproxy/tools/console/grideditor/col_text.pyc
-${PYSITELIB}/mitmproxy/tools/console/grideditor/editors.pyo
-${PYSITELIB}/mitmproxy/tools/console/grideditor/editors.pyc
+${PYSITELIB}/mitmproxy/tools/console/grideditor/__init__.pyo
 ${PYSITELIB}/mitmproxy/tools/console/grideditor/base.py
+${PYSITELIB}/mitmproxy/tools/console/grideditor/base.pyc
+${PYSITELIB}/mitmproxy/tools/console/grideditor/base.pyo
 ${PYSITELIB}/mitmproxy/tools/console/grideditor/col_bytes.py
+${PYSITELIB}/mitmproxy/tools/console/grideditor/col_bytes.pyc
+${PYSITELIB}/mitmproxy/tools/console/grideditor/col_bytes.pyo
 ${PYSITELIB}/mitmproxy/tools/console/grideditor/col_subgrid.py
+${PYSITELIB}/mitmproxy/tools/console/grideditor/col_subgrid.pyc
+${PYSITELIB}/mitmproxy/tools/console/grideditor/col_subgrid.pyo
 ${PYSITELIB}/mitmproxy/tools/console/grideditor/col_text.py
+${PYSITELIB}/mitmproxy/tools/console/grideditor/col_text.pyc
+${PYSITELIB}/mitmproxy/tools/console/grideditor/col_text.pyo
+${PYSITELIB}/mitmproxy/tools/console/grideditor/col_viewany.py
+${PYSITELIB}/mitmproxy/tools/console/grideditor/col_viewany.pyc
+${PYSITELIB}/mitmproxy/tools/console/grideditor/col_viewany.pyo
 ${PYSITELIB}/mitmproxy/tools/console/grideditor/editors.py
+${PYSITELIB}/mitmproxy/tools/console/grideditor/editors.pyc
+${PYSITELIB}/mitmproxy/tools/console/grideditor/editors.pyo
 ${PYSITELIB}/mitmproxy/tools/console/help.py
+${PYSITELIB}/mitmproxy/tools/console/help.pyc
+${PYSITELIB}/mitmproxy/tools/console/help.pyo
+${PYSITELIB}/mitmproxy/tools/console/keybindings.py
+${PYSITELIB}/mitmproxy/tools/console/keybindings.pyc
+${PYSITELIB}/mitmproxy/tools/console/keybindings.pyo
+${PYSITELIB}/mitmproxy/tools/console/keymap.py
+${PYSITELIB}/mitmproxy/tools/console/keymap.pyc
+${PYSITELIB}/mitmproxy/tools/console/keymap.pyo
+${PYSITELIB}/mitmproxy/tools/console/layoutwidget.py
+${PYSITELIB}/mitmproxy/tools/console/layoutwidget.pyc
+${PYSITELIB}/mitmproxy/tools/console/layoutwidget.pyo
 ${PYSITELIB}/mitmproxy/tools/console/master.py
+${PYSITELIB}/mitmproxy/tools/console/master.pyc
+${PYSITELIB}/mitmproxy/tools/console/master.pyo
 ${PYSITELIB}/mitmproxy/tools/console/options.py
-${PYSITELIB}/mitmproxy/tools/console/palettepicker.py
+${PYSITELIB}/mitmproxy/tools/console/options.pyc
+${PYSITELIB}/mitmproxy/tools/console/options.pyo
+${PYSITELIB}/mitmproxy/tools/console/overlay.py
+${PYSITELIB}/mitmproxy/tools/console/overlay.pyc
+${PYSITELIB}/mitmproxy/tools/console/overlay.pyo
 ${PYSITELIB}/mitmproxy/tools/console/palettes.py
-${PYSITELIB}/mitmproxy/tools/console/pathedit.py
+${PYSITELIB}/mitmproxy/tools/console/palettes.pyc
+${PYSITELIB}/mitmproxy/tools/console/palettes.pyo
 ${PYSITELIB}/mitmproxy/tools/console/searchable.py
-${PYSITELIB}/mitmproxy/tools/console/select.py
+${PYSITELIB}/mitmproxy/tools/console/searchable.pyc
+${PYSITELIB}/mitmproxy/tools/console/searchable.pyo
 ${PYSITELIB}/mitmproxy/tools/console/signals.py
+${PYSITELIB}/mitmproxy/tools/console/signals.pyc
+${PYSITELIB}/mitmproxy/tools/console/signals.pyo
 ${PYSITELIB}/mitmproxy/tools/console/statusbar.py
+${PYSITELIB}/mitmproxy/tools/console/statusbar.pyc
+${PYSITELIB}/mitmproxy/tools/console/statusbar.pyo
 ${PYSITELIB}/mitmproxy/tools/console/tabs.py
+${PYSITELIB}/mitmproxy/tools/console/tabs.pyc
+${PYSITELIB}/mitmproxy/tools/console/tabs.pyo
 ${PYSITELIB}/mitmproxy/tools/console/window.py
+${PYSITELIB}/mitmproxy/tools/console/window.pyc
+${PYSITELIB}/mitmproxy/tools/console/window.pyo
 ${PYSITELIB}/mitmproxy/tools/dump.py
+${PYSITELIB}/mitmproxy/tools/dump.pyc
+${PYSITELIB}/mitmproxy/tools/dump.pyo
 ${PYSITELIB}/mitmproxy/tools/main.py
+${PYSITELIB}/mitmproxy/tools/main.pyc
+${PYSITELIB}/mitmproxy/tools/main.pyo
 ${PYSITELIB}/mitmproxy/tools/web/__init__.py
-${PYSITELIB}/mitmproxy/tools/web/__init__.pyo
 ${PYSITELIB}/mitmproxy/tools/web/__init__.pyc
-${PYSITELIB}/mitmproxy/tools/web/app.pyo
-${PYSITELIB}/mitmproxy/tools/web/app.pyc
-${PYSITELIB}/mitmproxy/tools/web/master.pyo
-${PYSITELIB}/mitmproxy/tools/web/master.pyc
+${PYSITELIB}/mitmproxy/tools/web/__init__.pyo
 ${PYSITELIB}/mitmproxy/tools/web/app.py
+${PYSITELIB}/mitmproxy/tools/web/app.pyc
+${PYSITELIB}/mitmproxy/tools/web/app.pyo
 ${PYSITELIB}/mitmproxy/tools/web/master.py
+${PYSITELIB}/mitmproxy/tools/web/master.pyc
+${PYSITELIB}/mitmproxy/tools/web/master.pyo
 ${PYSITELIB}/mitmproxy/tools/web/static/app.css
 ${PYSITELIB}/mitmproxy/tools/web/static/app.js
 ${PYSITELIB}/mitmproxy/tools/web/static/fonts/fontawesome-webfont.eot
@@ -540,116 +621,115 @@ ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceImageIcon.png
 ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceJavaIcon.png
 ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceNotModifiedIcon.png
 ${PYSITELIB}/mitmproxy/tools/web/static/images/resourceRedirectIcon.png
+${PYSITELIB}/mitmproxy/tools/web/static/static.js
 ${PYSITELIB}/mitmproxy/tools/web/static/vendor.css
 ${PYSITELIB}/mitmproxy/tools/web/static/vendor.js
+${PYSITELIB}/mitmproxy/tools/web/static_viewer.py
+${PYSITELIB}/mitmproxy/tools/web/static_viewer.pyc
+${PYSITELIB}/mitmproxy/tools/web/static_viewer.pyo
 ${PYSITELIB}/mitmproxy/tools/web/templates/index.html
-${PYSITELIB}/mitmproxy/types/__init__.py
-${PYSITELIB}/mitmproxy/types/__init__.pyo
-${PYSITELIB}/mitmproxy/types/__init__.pyc
-${PYSITELIB}/mitmproxy/types/basethread.pyo
-${PYSITELIB}/mitmproxy/types/basethread.pyc
-${PYSITELIB}/mitmproxy/types/bidi.pyo
-${PYSITELIB}/mitmproxy/types/bidi.pyc
-${PYSITELIB}/mitmproxy/types/multidict.pyo
-${PYSITELIB}/mitmproxy/types/multidict.pyc
-${PYSITELIB}/mitmproxy/types/serializable.pyo
-${PYSITELIB}/mitmproxy/types/serializable.pyc
-${PYSITELIB}/mitmproxy/types/basethread.py
-${PYSITELIB}/mitmproxy/types/bidi.py
-${PYSITELIB}/mitmproxy/types/multidict.py
-${PYSITELIB}/mitmproxy/types/serializable.py
+${PYSITELIB}/mitmproxy/tools/web/webaddons.py
+${PYSITELIB}/mitmproxy/tools/web/webaddons.pyc
+${PYSITELIB}/mitmproxy/tools/web/webaddons.pyo
+${PYSITELIB}/mitmproxy/types.py
+${PYSITELIB}/mitmproxy/types.pyc
+${PYSITELIB}/mitmproxy/types.pyo
 ${PYSITELIB}/mitmproxy/utils/__init__.py
-${PYSITELIB}/mitmproxy/utils/__init__.pyo
 ${PYSITELIB}/mitmproxy/utils/__init__.pyc
-${PYSITELIB}/mitmproxy/utils/bits.pyo
-${PYSITELIB}/mitmproxy/utils/bits.pyc
-${PYSITELIB}/mitmproxy/utils/data.pyo
-${PYSITELIB}/mitmproxy/utils/data.pyc
-${PYSITELIB}/mitmproxy/utils/debug.pyo
-${PYSITELIB}/mitmproxy/utils/debug.pyc
-${PYSITELIB}/mitmproxy/utils/human.pyo
-${PYSITELIB}/mitmproxy/utils/human.pyc
-${PYSITELIB}/mitmproxy/utils/sliding_window.pyo
-${PYSITELIB}/mitmproxy/utils/sliding_window.pyc
-${PYSITELIB}/mitmproxy/utils/strutils.pyo
-${PYSITELIB}/mitmproxy/utils/strutils.pyc
-${PYSITELIB}/mitmproxy/utils/typecheck.pyo
-${PYSITELIB}/mitmproxy/utils/typecheck.pyc
-${PYSITELIB}/mitmproxy/utils/version_check.pyo
-${PYSITELIB}/mitmproxy/utils/version_check.pyc
+${PYSITELIB}/mitmproxy/utils/__init__.pyo
+${PYSITELIB}/mitmproxy/utils/arg_check.py
+${PYSITELIB}/mitmproxy/utils/arg_check.pyc
+${PYSITELIB}/mitmproxy/utils/arg_check.pyo
 ${PYSITELIB}/mitmproxy/utils/bits.py
+${PYSITELIB}/mitmproxy/utils/bits.pyc
+${PYSITELIB}/mitmproxy/utils/bits.pyo
 ${PYSITELIB}/mitmproxy/utils/data.py
+${PYSITELIB}/mitmproxy/utils/data.pyc
+${PYSITELIB}/mitmproxy/utils/data.pyo
 ${PYSITELIB}/mitmproxy/utils/debug.py
+${PYSITELIB}/mitmproxy/utils/debug.pyc
+${PYSITELIB}/mitmproxy/utils/debug.pyo
 ${PYSITELIB}/mitmproxy/utils/human.py
+${PYSITELIB}/mitmproxy/utils/human.pyc
+${PYSITELIB}/mitmproxy/utils/human.pyo
 ${PYSITELIB}/mitmproxy/utils/sliding_window.py
+${PYSITELIB}/mitmproxy/utils/sliding_window.pyc
+${PYSITELIB}/mitmproxy/utils/sliding_window.pyo
 ${PYSITELIB}/mitmproxy/utils/strutils.py
+${PYSITELIB}/mitmproxy/utils/strutils.pyc
+${PYSITELIB}/mitmproxy/utils/strutils.pyo
 ${PYSITELIB}/mitmproxy/utils/typecheck.py
-${PYSITELIB}/mitmproxy/utils/version_check.py
+${PYSITELIB}/mitmproxy/utils/typecheck.pyc
+${PYSITELIB}/mitmproxy/utils/typecheck.pyo
 ${PYSITELIB}/mitmproxy/version.py
+${PYSITELIB}/mitmproxy/version.pyc
+${PYSITELIB}/mitmproxy/version.pyo
 ${PYSITELIB}/mitmproxy/websocket.py
+${PYSITELIB}/mitmproxy/websocket.pyc
+${PYSITELIB}/mitmproxy/websocket.pyo
 ${PYSITELIB}/pathod/__init__.py
-${PYSITELIB}/pathod/__init__.pyo
 ${PYSITELIB}/pathod/__init__.pyc
-${PYSITELIB}/pathod/log.pyo
-${PYSITELIB}/pathod/log.pyc
-${PYSITELIB}/pathod/pathoc.pyo
-${PYSITELIB}/pathod/pathoc.pyc
-${PYSITELIB}/pathod/pathoc_cmdline.pyo
-${PYSITELIB}/pathod/pathoc_cmdline.pyc
-${PYSITELIB}/pathod/pathod.pyo
-${PYSITELIB}/pathod/pathod.pyc
-${PYSITELIB}/pathod/pathod_cmdline.pyo
-${PYSITELIB}/pathod/pathod_cmdline.pyc
-${PYSITELIB}/pathod/test.pyo
-${PYSITELIB}/pathod/test.pyc
-${PYSITELIB}/pathod/utils.pyo
-${PYSITELIB}/pathod/utils.pyc
+${PYSITELIB}/pathod/__init__.pyo
 ${PYSITELIB}/pathod/language/__init__.py
-${PYSITELIB}/pathod/language/__init__.pyo
 ${PYSITELIB}/pathod/language/__init__.pyc
-${PYSITELIB}/pathod/language/actions.pyo
-${PYSITELIB}/pathod/language/actions.pyc
-${PYSITELIB}/pathod/language/base.pyo
-${PYSITELIB}/pathod/language/base.pyc
-${PYSITELIB}/pathod/language/exceptions.pyo
-${PYSITELIB}/pathod/language/exceptions.pyc
-${PYSITELIB}/pathod/language/generators.pyo
-${PYSITELIB}/pathod/language/generators.pyc
-${PYSITELIB}/pathod/language/http.pyo
-${PYSITELIB}/pathod/language/http.pyc
-${PYSITELIB}/pathod/language/http2.pyo
-${PYSITELIB}/pathod/language/http2.pyc
-${PYSITELIB}/pathod/language/message.pyo
-${PYSITELIB}/pathod/language/message.pyc
-${PYSITELIB}/pathod/language/websockets.pyo
-${PYSITELIB}/pathod/language/websockets.pyc
-${PYSITELIB}/pathod/language/writer.pyo
-${PYSITELIB}/pathod/language/writer.pyc
+${PYSITELIB}/pathod/language/__init__.pyo
 ${PYSITELIB}/pathod/language/actions.py
+${PYSITELIB}/pathod/language/actions.pyc
+${PYSITELIB}/pathod/language/actions.pyo
 ${PYSITELIB}/pathod/language/base.py
+${PYSITELIB}/pathod/language/base.pyc
+${PYSITELIB}/pathod/language/base.pyo
 ${PYSITELIB}/pathod/language/exceptions.py
+${PYSITELIB}/pathod/language/exceptions.pyc
+${PYSITELIB}/pathod/language/exceptions.pyo
 ${PYSITELIB}/pathod/language/generators.py
+${PYSITELIB}/pathod/language/generators.pyc
+${PYSITELIB}/pathod/language/generators.pyo
 ${PYSITELIB}/pathod/language/http.py
+${PYSITELIB}/pathod/language/http.pyc
+${PYSITELIB}/pathod/language/http.pyo
 ${PYSITELIB}/pathod/language/http2.py
+${PYSITELIB}/pathod/language/http2.pyc
+${PYSITELIB}/pathod/language/http2.pyo
 ${PYSITELIB}/pathod/language/message.py
+${PYSITELIB}/pathod/language/message.pyc
+${PYSITELIB}/pathod/language/message.pyo
 ${PYSITELIB}/pathod/language/websockets.py
+${PYSITELIB}/pathod/language/websockets.pyc
+${PYSITELIB}/pathod/language/websockets.pyo
 ${PYSITELIB}/pathod/language/writer.py
+${PYSITELIB}/pathod/language/writer.pyc
+${PYSITELIB}/pathod/language/writer.pyo
 ${PYSITELIB}/pathod/log.py
+${PYSITELIB}/pathod/log.pyc
+${PYSITELIB}/pathod/log.pyo
 ${PYSITELIB}/pathod/pathoc.py
+${PYSITELIB}/pathod/pathoc.pyc
+${PYSITELIB}/pathod/pathoc.pyo
 ${PYSITELIB}/pathod/pathoc_cmdline.py
+${PYSITELIB}/pathod/pathoc_cmdline.pyc
+${PYSITELIB}/pathod/pathoc_cmdline.pyo
 ${PYSITELIB}/pathod/pathod.py
+${PYSITELIB}/pathod/pathod.pyc
+${PYSITELIB}/pathod/pathod.pyo
 ${PYSITELIB}/pathod/pathod_cmdline.py
+${PYSITELIB}/pathod/pathod_cmdline.pyc
+${PYSITELIB}/pathod/pathod_cmdline.pyo
 ${PYSITELIB}/pathod/protocols/__init__.py
-${PYSITELIB}/pathod/protocols/__init__.pyo
 ${PYSITELIB}/pathod/protocols/__init__.pyc
-${PYSITELIB}/pathod/protocols/http.pyo
-${PYSITELIB}/pathod/protocols/http.pyc
-${PYSITELIB}/pathod/protocols/http2.pyo
-${PYSITELIB}/pathod/protocols/http2.pyc
-${PYSITELIB}/pathod/protocols/websockets.pyo
-${PYSITELIB}/pathod/protocols/websockets.pyc
+${PYSITELIB}/pathod/protocols/__init__.pyo
 ${PYSITELIB}/pathod/protocols/http.py
+${PYSITELIB}/pathod/protocols/http.pyc
+${PYSITELIB}/pathod/protocols/http.pyo
 ${PYSITELIB}/pathod/protocols/http2.py
+${PYSITELIB}/pathod/protocols/http2.pyc
+${PYSITELIB}/pathod/protocols/http2.pyo
 ${PYSITELIB}/pathod/protocols/websockets.py
+${PYSITELIB}/pathod/protocols/websockets.pyc
+${PYSITELIB}/pathod/protocols/websockets.pyo
 ${PYSITELIB}/pathod/test.py
+${PYSITELIB}/pathod/test.pyc
+${PYSITELIB}/pathod/test.pyo
 ${PYSITELIB}/pathod/utils.py
+${PYSITELIB}/pathod/utils.pyc
+${PYSITELIB}/pathod/utils.pyo
diff --git a/net/mitmproxy/distinfo b/net/mitmproxy/distinfo
index e43224f7cd2..83cce9b3909 100644
--- a/net/mitmproxy/distinfo
+++ b/net/mitmproxy/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2017/06/21 08:34:00 leot Exp $
+$NetBSD: distinfo,v 1.12 2018/02/26 12:28:48 leot Exp $
 
-SHA1 (mitmproxy-2.0.2.tar.gz) = 51b939c642f35cac8a54a427549a0869e0e253f3
-RMD160 (mitmproxy-2.0.2.tar.gz) = 8057a23e33f2b32ede86801eaaac0b49d1a4c67a
-SHA512 (mitmproxy-2.0.2.tar.gz) = 8a38340b3b1dd73c99c9e9b06a59bff78a23b2a851e1032ee0b7354ac46c834a3d005a67dc5238030570719eb5f842cb2a8ce64ffc7c5a01cbfa9a9511c08e66
-Size (mitmproxy-2.0.2.tar.gz) = 28498343 bytes
-SHA1 (patch-setup.py) = cf21e43a1204981902236affadaf3e63f19c31f0
+SHA1 (mitmproxy-3.0.3.tar.gz) = 73c5df44ec8ebfe7bef672234578f31473cc714d
+RMD160 (mitmproxy-3.0.3.tar.gz) = 071de5dfd7b519d4be0c910127e749b46f663987
+SHA512 (mitmproxy-3.0.3.tar.gz) = 5477b8ac438b8f2ea40e658c50988881ef0f3eeda3178b2fbed9618d2a490c28f59b32174e150d8cbeb1b04b4b868a64029bde6499983dff782d4204aa0f8d37
+Size (mitmproxy-3.0.3.tar.gz) = 27171521 bytes
+SHA1 (patch-setup.py) = e692d17abb332a61d4cfec52ab17d0c93d84180a
diff --git a/net/mitmproxy/patches/patch-setup.py b/net/mitmproxy/patches/patch-setup.py
index a2586e7eb01..50f5e96dc20 100644
--- a/net/mitmproxy/patches/patch-setup.py
+++ b/net/mitmproxy/patches/patch-setup.py
@@ -1,109 +1,87 @@
-$NetBSD: patch-setup.py,v 1.5 2017/04/14 13:15:04 leot Exp $
+$NetBSD: patch-setup.py,v 1.6 2018/02/26 12:28:48 leot Exp $
 
 Avoid too strict version requirements.
 
---- setup.py.orig	2017-03-15 18:44:08.000000000 +0000
+--- setup.py.orig	2018-02-22 12:17:33.000000000 +0000
 +++ setup.py
-@@ -60,61 +60,61 @@ setup(
+@@ -61,47 +61,47 @@ setup(
      # https://packaging.python.org/en/latest/requirements/#install-requires
      # It is not considered best practice to use install_requires to pin dependencies to specific versions.
      install_requires=[
 -        "blinker>=1.4, <1.5",
--        "click>=6.2, <7",
+-        "brotlipy>=0.7.0,<0.8",
 +        "blinker>=1.4",
-+        "click>=6.2",
++        "brotlipy>=0.7.0",
          "certifi>=2015.11.20.1",  # no semver here - this should always be on the last release!
--        "construct>=2.8, <2.9",
--        "cryptography>=1.3, <1.9",
--        "cssutils>=1.0.1, <1.1",
--        "h2>=2.5.1, <3",
--        "html2text>=2016.1.8, <=2016.9.19",
--        "hyperframe>=4.0.1, <5",
--        "jsbeautifier>=1.6.3, <1.7",
--        "kaitaistruct>=0.6, <0.7",
+-        "click>=6.2, <7",
+-        "cryptography>=2.1.4,<2.2",
+-        'h11>=0.7.0,<0.8',
+-        "h2>=3.0.1,<4",
+-        "hyperframe>=5.1.0,<6",
+-        "kaitaistruct>=0.7,<0.9",
+-        "ldap3>=2.4,<2.5",
 -        "passlib>=1.6.5, <1.8",
--        "pyasn1>=0.1.9, <0.3",
--        "pyOpenSSL>=16.0, <17.0",
+-        "pyasn1>=0.3.1,<0.5",
+-        "pyOpenSSL>=17.5,<17.6",
 -        "pyparsing>=2.1.3, <2.3",
--        "pyperclip>=1.5.22, <1.6",
+-        "pyperclip>=1.6.0, <1.7",
 -        "requests>=2.9.1, <3",
--        "ruamel.yaml>=0.13.2, <0.14",
--        "tornado>=4.3, <4.5",
--        "urwid>=1.3.1, <1.4",
--        "watchdog>=0.8.3, <0.9",
--        "brotlipy>=0.5.1, <0.7",
+-        "ruamel.yaml>=0.13.2, <0.16",
 -        "sortedcontainers>=1.5.4, <1.6",
-+        "construct>=2.8",
-+        "cryptography>=1.3",
-+        "cssutils>=1.0.1",
-+        "h2>=2.5.1",
-+        "html2text>=2016.1.8",
-+        "hyperframe>=4.0.1",
-+        "jsbeautifier>=1.6.3",
-+        "kaitaistruct>=0.6",
+-        "tornado>=4.3, <4.6",
+-        "urwid>=2.0.1,<2.1",
+-        "wsproto>=0.11.0,<0.12.0",
++        "click>=6.2",
++        "cryptography>=2.1.4",
++        'h11>=0.7.0',
++        "h2>=3.0.1",
++        "hyperframe>=5.1.0",
++        "kaitaistruct>=0.7",
++        "ldap3>=2.4",
 +        "passlib>=1.6.5",
-+        "pyasn1>=0.1.9",
-+        "pyOpenSSL>=16.0",
++        "pyasn1>=0.3.1",
++        "pyOpenSSL>=17.5",
 +        "pyparsing>=2.1.3",
-+        "pyperclip>=1.5.22",
++        "pyperclip>=1.6.0",
 +        "requests>=2.9.1",
 +        "ruamel.yaml>=0.13.2",
-+        "tornado>=4.3",
-+        "urwid>=1.3.1",
-+        "watchdog>=0.8.3",
-+        "brotlipy>=0.5.1",
 +        "sortedcontainers>=1.5.4",
-         # transitive from cryptography, we just blacklist here.
-         # https://github.com/pypa/setuptools/issues/861
--        "setuptools>=11.3, !=29.0.0",
-+        "setuptools>=11.3",
++        "tornado>=4.3",
++        "urwid>=2.0.1",
++        "wsproto>=0.11.0",
      ],
      extras_require={
          ':sys_platform == "win32"': [
--            "pydivert>=2.0.3, <2.1",
+-            "pydivert>=2.0.3,<2.2",
 +            "pydivert>=2.0.3",
          ],
-         ':sys_platform != "win32"': [
-         ],
          'dev': [
+-            "flake8>=3.5, <3.6",
 -            "Flask>=0.10.1, <0.13",
--            "flake8>=3.2.1, <3.4",
--            "mypy>=0.471, <0.480",
--            "rstcheck>=2.2, <4.0",
+-            "mypy>=0.560,<0.561",
+-            "pytest-cov>=2.5.1,<3",
+-            "pytest-faulthandler>=1.3.1,<2",
+-            "pytest-timeout>=1.2.1,<2",
+-            "pytest-xdist>=1.22,<2",
+-            "pytest>=3.3,<4",
 -            "tox>=2.3, <3",
--            "pytest>=3, <3.1",
--            "pytest-cov>=2.2.1, <3",
--            "pytest-timeout>=1.0.0, <2",
--            "pytest-xdist>=1.14, <2",
--            "pytest-faulthandler>=1.3.0, <2",
--            "sphinx>=1.3.5, <1.6",
--            "sphinx-autobuild>=0.5.2, <0.7",
--            "sphinxcontrib-documentedlist>=0.5.0, <0.6",
--            "sphinx_rtd_theme>=0.1.9, <0.2",
+-            "rstcheck>=2.2, <4.0",
++            "flake8>=3.5",
 +            "Flask>=0.10.1",
-+            "flake8>=3.2.1",
-+            "mypy>=0.471",
-+            "rstcheck>=2.2",
++            "mypy>=0.560",
++            "pytest-cov>=2.5.1",
++            "pytest-faulthandler>=1.3.1",
++            "pytest-timeout>=1.2.1",
++            "pytest-xdist>=1.22",
++            "pytest>=3.3",
 +            "tox>=2.3",
-+            "pytest>=3",
-+            "pytest-cov>=2.2.1",
-+            "pytest-timeout>=1.0.0",
-+            "pytest-xdist>=1.14",
-+            "pytest-faulthandler>=1.3.0",
-+            "sphinx>=1.3.5",
-+            "sphinx-autobuild>=0.5.2",
-+            "sphinxcontrib-documentedlist>=0.5.0",
-+            "sphinx_rtd_theme>=0.1.9",
-         ],
-         'contentviews': [
++            "rstcheck>=2.2",
          ],
          'examples': [
--            "beautifulsoup4>=4.4.1, <4.6",
--            "pytz>=2015.07.0, <=2016.10",
--            "Pillow>=3.2, <4.1",
+-            "beautifulsoup4>=4.4.1, <4.7",
+-            "Pillow>=4.3,<5.1",
 +            "beautifulsoup4>=4.4.1",
-+            "pytz>=2015.07.0",
-+            "Pillow>=3.2",
++            "Pillow>=4.3",
          ]
      }
  )