From 22347d48e9fb84e43e817746b399e5d258fb4802 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Tue, 31 Jul 2018 13:44:47 +0200
Subject: update CHANGELOG for 4.0.4

---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index ddf1afe5..9c3df1c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+31 July 2018: mitmproxy 4.0.4
+
+    * Security: Protect mitmweb against DNS rebinding. (CVE-2018-14505, @atx)
+    * Reduce certificate lifetime to two years to be conformant with
+      the current CA/Browser Forum Baseline Requirements. (@muffl0n)
+      (https://cabforum.org/2017/03/17/ballot-193-825-day-certificate-lifetimes/)
+    * Update cryptography to version 2.3.
+
 15 June 2018: mitmproxy 4.0.3
 
     * Add support for IPv6 transparent mode on Windows (#3174)
-- 
cgit v1.2.3