From 5aace7eed8899756799679f7667739dfb58b4dbc Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Thu, 23 Oct 2014 15:05:01 +1300
Subject: Keep sidebar ordering alphabetical, add SOCKS documentation

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index 7f8896f1..c78fdcce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 
 23 October 2014: mitmproxy 0.11:
 
-    * SOCKS proxy mode
+    * SOCKS5 proxy mode allows mitmproxy to act as a SOCKS5 proxy server
 
     * Data streaming for response bodies exceeding a threshold
       (bradpeabody@gmail.com)
-- 
cgit v1.2.3