From 709e67afe47fad1ce2de46a49d40b1105acd9e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=B4=E5=A8=83=E9=85=B1?= <mmgac001@gmail.com>
Date: Thu, 11 May 2017 20:51:24 +0800
Subject: [PATCH] bump

---
 CHANGES                | 13 +++++++++++++
 mujson_mgr.py          |  4 ++--
 shadowsocks/version.py |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 072bb1d..1f59c41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+3.3.0 2017-05-11
+- connect_log include local addr & port
+- fix auth_chain_a UDP bug
+- add "additional_ports_only"
+- add interface legendsockssr
+- run with newest python version
+- parse comment in hosts
+- update mujson_mgr
+- add cymysql setup script
+- new speed tester
+- fix leaks
+- bugs fixed
+
 3.2.0 2017-04-27
 - add auth_chain_a
 - remove auth_aes128, auth_sha1, auth_sha1_v2, verify_simple, auth_simple, verify_sha1
diff --git a/mujson_mgr.py b/mujson_mgr.py
index 6c1190e..39e6b6e 100644
--- a/mujson_mgr.py
+++ b/mujson_mgr.py
@@ -249,8 +249,8 @@ def main():
 			'+2': 'tls1.2_ticket_auth_compatible',
 			'2': 'tls1.2_ticket_auth'}
 	fast_set_protocol = {'0': 'origin',
-			'a4': 'auth_sha1_v4',
-			'+a4': 'auth_sha1_v4_compatible',
+			's4': 'auth_sha1_v4',
+			'+s4': 'auth_sha1_v4_compatible',
 			'am': 'auth_aes128_md5',
 			'as': 'auth_aes128_sha1',
 			'ca': 'auth_chain_a',
diff --git a/shadowsocks/version.py b/shadowsocks/version.py
index eea9c31..786000f 100644
--- a/shadowsocks/version.py
+++ b/shadowsocks/version.py
@@ -16,5 +16,5 @@
 # under the License.
 
 def version():
-    return '3.2.0 2017-04-27'
+    return '3.3.0 2017-05-11'