aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-11-11 12:30:56 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-11-11 12:30:56 +0100
commit2335d00c1cebcef80976e48d9c43920b1e75a447 (patch)
treed3eb6dd4c2a1a082cb2568fed6aa1f5478245e8c /CHANGELOG
parentf19ee74b99d0049f4789673e202cfc3fda59bb04 (diff)
parent5873516d991e5d04b565b93f95137e1cb2158aca (diff)
downloadmitmproxy-2335d00c1cebcef80976e48d9c43920b1e75a447.tar.gz
mitmproxy-2335d00c1cebcef80976e48d9c43920b1e75a447.tar.bz2
mitmproxy-2335d00c1cebcef80976e48d9c43920b1e75a447.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c78fdcce..2df1c839 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
23 October 2014: mitmproxy 0.11:
+
+ * Performance improvements for mitmproxy console
* SOCKS5 proxy mode allows mitmproxy to act as a SOCKS5 proxy server