From aa90fd359dc69481907bacd0406294a1f842497c Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sat, 17 Dec 2016 10:57:13 +1300
Subject: Administrivia: docs for new config file, minor adjustments

For now, the config file docs basically say "it's YAML, read the source". We
should do better for the next release.
---
 CHANGELOG | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index 87d5a2c8..e96a2237 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-18 December 2017: mitmproxy 1.0
+18 December 2016: mitmproxy 1.0
 
     * Mitmproxy is now Python 3 only
 
@@ -13,6 +13,9 @@
     * http2: significant improvements, but is temporarily disabled by default
       due to wide-spread protocol implementation errors on some large website
 
+    * websockets: the protocol implementation is now mature, and is enabled by
+      default. Complete UI support is coming in the next release.
+
     * A myriad of other small improvements throughout the project.
 
 
-- 
cgit v1.2.3