aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c75dffbb..7180aa71 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@
* Fix an issue that caused mitmproxy to not retry HTTP requests on timeout.
- * Various other fixes (@kira0204, @fenilgandhi, @tran-tien-dat, @smonami,
+ * Various other fixes (@kira0204, @fenilgandhi, @tran-tien-dat, @smonami,
@luzpaz, @fristonio, @kajojify, @Oliver-Fish, @hcbarry, @jplochocki, @MikeShi42,
@ghillu, @emilstahl)
@@ -423,7 +423,7 @@
24 July 2015: mitmproxy 0.13
* Upstream certificate validation. See the --verify-upstream-cert,
- --upstream-trusted-cadir and --upstream-trusted-ca parameters. Thanks to
+ --upstream-trusted-confdir and --upstream-trusted-ca parameters. Thanks to
Kyle Morton (github.com/kyle-m) for his work on this.
* Add HTTP transparent proxy mode. This uses the host headers from HTTP