diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2015-05-20 13:13:54 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2015-05-20 13:13:54 +1200 |
commit | 634f2e2c24ae2bb807c26c9e13cd35956bc9b79d (patch) | |
tree | dace633108375c622c4b00c164518b6f3621239e | |
parent | 6685c27697e4ffbe55ec8dc8f4f9b6043975239a (diff) | |
parent | 26923dd0e41fe9d5db6fa0677ee0bc627f5a7db2 (diff) | |
download | mitmproxy-634f2e2c24ae2bb807c26c9e13cd35956bc9b79d.tar.gz mitmproxy-634f2e2c24ae2bb807c26c9e13cd35956bc9b79d.tar.bz2 mitmproxy-634f2e2c24ae2bb807c26c9e13cd35956bc9b79d.zip |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
-rw-r--r-- | CHANGELOG | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |