Bump version

shadowsocks · Aug 9, 2019 · 615588b · 615588b
1 parent 1c4ddd3
commit 615588b
Show file tree

Hide file tree

Showing 9 changed files with 406 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.2)
 
 set(PROJECT_NAME shadowsocks-libev)
-set(RELEASE_DATE 2019-06-08)
-set(PROJECT_VERSION "3.3.0")
+set(RELEASE_DATE 2019-08-09)
+set(PROJECT_VERSION "3.3.1")
 set(PROJECT_DESC "a lightweight secured socks5 proxy")
 set(PROJECT_URL "https://shadowsocks.org")
 set(PROJECT_ISSUES_URL "https://github.com/shadowsocks/shadowsocks-libev")

diff --git a/Changes b/Changes
@@ -1,3 +1,11 @@
+shadowsocks-libev (3.3.1-1) unstable; urgency=high
+
+  * Fix a high CPU bug introduced in 3.3.0. (#2449)
+  * Fix MinGW build. (#2438)
+  * Minor bug fixes. (#2402, #2412, #2427, #2443)
+
+ -- Max Lv <max.c.lv@gmail.com>  Fri, 09 Aug 2019 15:02:34 +0800
+
 shadowsocks-libev (3.3.0-1) unstable; urgency=medium
 
   * Enlarge the socket buffer size to 16KB.

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ It is a port of [Shadowsocks](https://github.com/shadowsocks/shadowsocks)
 created by [@clowwindy](https://github.com/clowwindy), and maintained by
 [@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang).
 
-Current version: 3.3.0 | [Changelog](debian/changelog)
+Current version: 3.3.1 | [Changelog](debian/changelog)
 
 ## Features
 

diff --git a/config.json b/config.json
@@ -0,0 +1,12 @@
+{
+    "server":"la.maxlv.net",
+    "server_port":1080,
+    "local_address":"0.0.0.0",
+    "local_port":1080,
+    "password":"CCCCCCCC",
+    "method":"aes-256-gcm",
+    "timeout":60,
+    "mode":"tcp_and_udp",
+    "plugin":"obfs-local",
+    "plugin_opts":"obfs=http;obfs-host=www.CCCCCCC.com"
+}
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl                                               -*- Autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT([shadowsocks-libev], [3.3.0], [max.c.lv@gmail.com])
+AC_INIT([shadowsocks-libev], [3.3.1], [max.c.lv@gmail.com])
 AC_CONFIG_SRCDIR([src/crypto.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(auto)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+shadowsocks-libev (3.3.1-1) unstable; urgency=high
+
+  * Fix a high CPU bug introduced in 3.3.0. (#2449)
+  * Fix MinGW build. (#2438)
+  * Minor bug fixes. (#2402, #2412, #2427, #2443)
+
+ -- Max Lv <max.c.lv@gmail.com>  Fri, 09 Aug 2019 15:02:34 +0800
+
 shadowsocks-libev (3.3.0-1) unstable; urgency=medium
 
   * Enlarge the socket buffer size to 16KB.