Merge pull request #2310 from fatedier/dev

bump version

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.

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

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)