aboutsummaryrefslogtreecommitdiffstats
path: root/release/docker
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2019-11-15 17:24:59 +0100
committerGitHub <noreply@github.com>2019-11-15 17:24:59 +0100
commit50443df3404e660984c5bbfd999dc96d0bc9b1b2 (patch)
tree58a1636284b7a933b7c483531723f780f77e6efc /release/docker
parent3eebfed79f4d54840a054c2dc5061e155c416d3e (diff)
parentf6f9eb2c4e022cd44ccc39b3f61fdf31cbfea793 (diff)
downloadmitmproxy-50443df3404e660984c5bbfd999dc96d0bc9b1b2.tar.gz
mitmproxy-50443df3404e660984c5bbfd999dc96d0bc9b1b2.tar.bz2
mitmproxy-50443df3404e660984c5bbfd999dc96d0bc9b1b2.zip
Merge branch 'master' into master
Diffstat (limited to 'release/docker')
-rw-r--r--release/docker/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/docker/README.md b/release/docker/README.md
index 4511a33a..b676d3ae 100644
--- a/release/docker/README.md
+++ b/release/docker/README.md
@@ -1,6 +1,6 @@
# mitmproxy
-Containerized version of [mitmproxy](https://mitmproxy.org/), an interactive SSL-capable intercepting HTTP proxy.
+Containerized version of [mitmproxy](https://mitmproxy.org/): an interactive, SSL/TLS-capable intercepting proxy for HTTP/1, HTTP/2, and WebSockets.
# Usage