From 51c8ae4d7805b19542e39d42092ce4032752f837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=B4=E5=A8=83=E9=85=B1?= <mmgac001@gmail.com>
Date: Fri, 7 Apr 2017 11:55:06 +0800
Subject: [PATCH] bump

---
 CHANGES                | 4 ++++
 shadowsocks/version.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 05bda56..0010890 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3.1.2 2017-04-07
+- display UID
+- auto adjust TCP MSS
+
 3.1.1 2017-03-25
 - add "New session ticket"
 - ignore bind 10.0.0.0/8 and 192.168.0.0/16 by default
diff --git a/shadowsocks/version.py b/shadowsocks/version.py
index eed0e4e..882c72e 100644
--- a/shadowsocks/version.py
+++ b/shadowsocks/version.py
@@ -16,5 +16,5 @@
 # under the License.
 
 def version():
-    return '3.1.1 2017-03-25'
+    return '3.1.2 2017-04-07'