From c6bf6f59e68c5cb45ba519e1213f5df63921cb27 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Mon, 25 Mar 2019 18:38:02 +0800
Subject: [PATCH 1/2] update package.sh

---
 package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.sh b/package.sh
index e82859c6b7..7b0612aba4 100755
--- a/package.sh
+++ b/package.sh
@@ -44,7 +44,7 @@ for os in $os_all; do
             mv ./frps_${os}_${arch} ${frp_path}/frps
         fi  
         cp ./LICENSE ${frp_path}
-        cp ./conf/* ${frp_path}
+        cp -rf ./conf/* ${frp_path}
 
         # packages
         cd ./packages

From 9cee263c91a990f4d7e498dad18d3cec13b168b7 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Tue, 26 Mar 2019 19:28:24 +0800
Subject: [PATCH 2/2] fix panic error when reconnecting using tls

---
 utils/net/conn.go        | 4 ++++
 utils/version/version.go | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/utils/net/conn.go b/utils/net/conn.go
index e7164571a9..9f415ec8ae 100644
--- a/utils/net/conn.go
+++ b/utils/net/conn.go
@@ -211,6 +211,10 @@ func ConnectServerByProxy(proxyUrl string, protocol string, addr string) (c Conn
 
 func ConnectServerByProxyWithTLS(proxyUrl string, protocol string, addr string, tlsConfig *tls.Config) (c Conn, err error) {
 	c, err = ConnectServerByProxy(proxyUrl, protocol, addr)
+	if err != nil {
+		return
+	}
+
 	if tlsConfig == nil {
 		return
 	}
diff --git a/utils/version/version.go b/utils/version/version.go
index 2bfb08579f..ae0707d03c 100644
--- a/utils/version/version.go
+++ b/utils/version/version.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 )
 
-var version string = "0.25.2"
+var version string = "0.25.3"
 
 func Full() string {
 	return version