Merge branch 'release/0.4.4'

lparam · Nov 21, 2015 · b3058ec · b3058ec
2 parents 4f77da3 + 2a17a0f
commit b3058ec
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/3rd/c-ares b/3rd/c-ares
diff --git a/3rd/libsodium b/3rd/libsodium
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,9 @@
-v0.4.3 (2015-10-18)
+v0.4.4 (2015-10-21)
+-----------
+* Fix: Openwrt start script
+
+
+v0.4.3 (2015-10-21)
 -----------
 * Hotfix: Android build script
 

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 MAJOR = 0
 MINOR = 4
-PATCH = 3
+PATCH = 4
 NAME = xSocks
 
 ifdef O

diff --git a/openwrt/Makefile b/openwrt/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xSocks
-PKG_VERSION:=0.4.3
+PKG_VERSION:=0.4.4
 PKG_RELEASE=
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/openwrt/files/xsocks.init → openwrt/files/xSocks.init b/openwrt/files/xsocks.init → openwrt/files/xSocks.init
diff --git a/src/common.h b/src/common.h
@@ -4,7 +4,7 @@
 #include "uv.h"
 #include "socks.h"
 
-#define XSOCKS_VERSION      "0.4.3"
+#define XSOCKS_VERSION      "0.4.4"
 
 struct server_context {
     int index;