From 9f1cbe8746df6096e877b2cc57d386ff08f079d8 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Thu, 22 Dec 2016 02:55:07 +0100
Subject: [PATCH] add mitmweb and Windows compat to changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index 264fadaad..2b585bd57 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,14 @@
 
     * All mitmproxy tools are now Python 3 only! We plan to support Python 3.5 and higher.
 
+    * Web-Based User Interface: Mitmproxy now offically has a web-based user interface
+      called mitmweb. We consider it stable for all features currently exposed 
+      in the UI, but it still misses a lot of mitmproxy’s options.
+      
+    * Windows Compatibility: With mitmweb, mitmproxy is now useable on Windows. 
+      We are also introducing an installer (kindly sponsored by BitRock) that 
+      simplifies setup.
+      
     * Configuration: The config file format is now a single YAML file. In most cases,
       converting to the new format should be trivial - please see the docs for
       more information.