From 6e3fdd0d6212017bb6ce82132edfeabf8dd74884 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, 18 May 2017 17:43:37 +0800
Subject: [PATCH] bump

---
 CHANGES                 | 6 ++++++
 shadowsocks/tcprelay.py | 2 +-
 shadowsocks/version.py  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1f59c41..2c3bd3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+3.3.1 2017-05-18
+- fix stop script
+- Async DNS query under UDP
+- fix old version of OpenSSL
+- http reply
+
 3.3.0 2017-05-11
 - connect_log include local addr & port
 - fix auth_chain_a UDP bug
diff --git a/shadowsocks/tcprelay.py b/shadowsocks/tcprelay.py
index faa4af6..7dfb445 100644
--- a/shadowsocks/tcprelay.py
+++ b/shadowsocks/tcprelay.py
@@ -656,7 +656,7 @@ class TCPRelayHandler(object):
                 common.connect_log('TCP request %s:%d by user %d' %
                         (common.to_str(remote_addr), remote_port, self._user_id))
                 if remote_addr == b'0.0.0.0' and remote_port == 80:
-                    backdata = b'HTTP/1.0 200 OK\r\nConnection: close\r\n\r\n' + common.to_bytes(version.version())
+                    backdata = b'HTTP/1.0 200 OK\r\nConnection: close\r\n\r\nShadowsocksR ' + common.to_bytes(version.version())
                     backdata = self._protocol.server_pre_encrypt(backdata)
                     backdata = self._encryptor.encrypt(backdata)
                     backdata = self._obfs.server_encode(backdata)
diff --git a/shadowsocks/version.py b/shadowsocks/version.py
index 786000f..748404a 100644
--- a/shadowsocks/version.py
+++ b/shadowsocks/version.py
@@ -16,5 +16,5 @@
 # under the License.
 
 def version():
-    return '3.3.0 2017-05-11'
+    return '3.3.1 2017-05-18'