From 9f8db314d65ab851d2dba9dd8558268899d99316 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Wed, 17 Mar 2021 11:43:03 +0800
Subject: [PATCH 1/3] update

---
 .github/workflows/build-and-push-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index a507ea01..836058d9 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -18,7 +18,7 @@ jobs:
         name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.15
       -
         run: go version
       -

From 0ff27fc9ac1ed23dbbd1915a20998b212fd93794 Mon Sep 17 00:00:00 2001
From: Chotow <i@choyri.com>
Date: Thu, 18 Mar 2021 11:05:03 +0800
Subject: [PATCH 2/3] fix(server): listen udp port failed (#2308)

fix #2306
---
 server/service.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/service.go b/server/service.go
index fe54cf78..677bda0d 100644
--- a/server/service.go
+++ b/server/service.go
@@ -265,7 +265,7 @@ func NewService(cfg config.ServerCommonConf) (svr *Service, err error) {
 	// Create nat hole controller.
 	if cfg.BindUDPPort > 0 {
 		var nc *nathole.Controller
-		address := net.JoinHostPort(cfg.BindAddr, strconv.Itoa(cfg.BindPort))
+		address := net.JoinHostPort(cfg.BindAddr, strconv.Itoa(cfg.BindUDPPort))
 		nc, err = nathole.NewController(address)
 		if err != nil {
 			err = fmt.Errorf("Create nat hole controller error, %v", err)

From fdef7448a717a6f0dc2cf2d5eedf5de0c67a7191 Mon Sep 17 00:00:00 2001
From: wuqing <wuqing@pinduoduo.com>
Date: Thu, 18 Mar 2021 11:12:10 +0800
Subject: [PATCH 3/3] update version

---
 Release.md                  | 12 ------------
 pkg/util/version/version.go |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/Release.md b/Release.md
index 658d4a33..e69de29b 100644
--- a/Release.md
+++ b/Release.md
@@ -1,12 +0,0 @@
-### New
-
-* New plugin `https2https`.
-* frpc supports `tls_server_name` to override the default value from `server_addr`.
-
-### Improvement
-
-* Increase reconnect frequency if it occurs an network error between frpc and frps.
-
-### Fix
-
-* Fix panic issue about xtcp.
diff --git a/pkg/util/version/version.go b/pkg/util/version/version.go
index 6cbe16a9..f4d9e0a8 100644
--- a/pkg/util/version/version.go
+++ b/pkg/util/version/version.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 )
 
-var version string = "0.36.0"
+var version string = "0.36.1"
 
 func Full() string {
 	return version