aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-05-20 13:13:54 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-05-20 13:13:54 +1200
commit634f2e2c24ae2bb807c26c9e13cd35956bc9b79d (patch)
treedace633108375c622c4b00c164518b6f3621239e
parent6685c27697e4ffbe55ec8dc8f4f9b6043975239a (diff)
parent26923dd0e41fe9d5db6fa0677ee0bc627f5a7db2 (diff)
downloadmitmproxy-634f2e2c24ae2bb807c26c9e13cd35956bc9b79d.tar.gz
mitmproxy-634f2e2c24ae2bb807c26c9e13cd35956bc9b79d.tar.bz2
mitmproxy-634f2e2c24ae2bb807c26c9e13cd35956bc9b79d.zip
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4d9d27f4..c988a650 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,7 +24,7 @@
* mitmproxy console: Various components of requests and responses can be
copied to the clipboard from mitmproxy - thanks to @marceloglezer.
- * Support for creating new requests from scratch in mitmproxy console.
+ * Support for creating new requests from scratch in mitmproxy console (@marceloglezer).
* SSLKEYLOGFILE environment variable to specify a logging location for TLS
master keys. This can be used with tools like Wireshark to allow TLS