From 9fbdbb1c021d891507dec1a50405921da8b3b11d Mon Sep 17 00:00:00 2001
From: ffdfgdfg <heyingtingaaa@gmail.com>
Date: Mon, 2 Mar 2020 13:52:00 +0800
Subject: [PATCH 1/3] update ci (#429)

* Update .travis.yml

* Update .travis.yml
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5c3457..1d3888a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,9 @@ before_deploy:
 
 deploy:
   provider: releases
-  api_key:
-    secure: ${TOKEN}
-  skip_cleanup: true
+  edge: true
+  token: ${GH_TOKEN}
+  cleanup: false
   file:
   - freebsd_386_client.tar.gz
   - freebsd_386_server.tar.gz

From 3f08bf96f925a40010c5c38023dba1226d4b9930 Mon Sep 17 00:00:00 2001
From: yzy613 <59520517+yzy613@users.noreply.github.com>
Date: Tue, 10 Mar 2020 17:09:09 +0800
Subject: [PATCH 2/3] Optimize compilation speed

del "master"
change "1.13" to 1.13.x
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6c61714..b3a4bac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
 language: go
 
 go:
-  - "1.13"
-  - master
+  - 1.13.x
 services:
   - docker
 script:

From 27a7a67e3ca3bdf07d21276ef8fb373c2454589e Mon Sep 17 00:00:00 2001
From: wyaode <33099640+wyaode@users.noreply.github.com>
Date: Wed, 25 Mar 2020 09:36:51 +0800
Subject: [PATCH 3/3] Update npc.go
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决npc同时支持客户端和私密代理访问端的问题  #472
暂不支持网页配置私密代理访问端
---
 cmd/npc/npc.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmd/npc/npc.go b/cmd/npc/npc.go
index f74d6fb..fa51ef7 100644
--- a/cmd/npc/npc.go
+++ b/cmd/npc/npc.go
@@ -218,7 +218,6 @@ func run() {
 		commonConfig.Client = new(file.Client)
 		commonConfig.Client.Cnf = new(file.Config)
 		go client.StartLocalServer(localServer, commonConfig)
-		return
 	}
 	env := common.GetEnvMap()
 	if *serverAddr == "" {