Merge branch 'master' of github.com:v2fly/v2ray-core

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Shelikhoo
2020-06-18 11:20:18 +08:00
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -198,7 +198,7 @@ func (c *udpConn) RemoteAddr() net.Addr {
}
func (c *udpConn) LocalAddr() net.Addr {
return c.remote
return c.local
}
func (*udpConn) SetDeadline(time.Time) error {
+1 -1
View File
@@ -9,7 +9,7 @@ jobs:
- checkout: self
- task: GoTool@0
inputs:
version: '1.13'
version: '1.14'
- script: |
go test -p 1 -v -timeout 30m ./...
workingDirectory: '$(Build.SourcesDirectory)'
+2 -2
View File
@@ -42,7 +42,7 @@ jobs:
- checkout: self
- task: GoTool@0
inputs:
version: '1.14.1'
version: '1.14.4'
- script: |
bash ./testing/coverage/coverall
workingDirectory: '$(Build.SourcesDirectory)'
@@ -66,7 +66,7 @@ jobs:
- checkout: self
- task: GoTool@0
inputs:
version: '1.14.1'
version: '1.14.4'
- script: |
mkdir triggersrc
ls -I "triggersrc" | xargs cp -rf -t triggersrc
+1 -1
View File
@@ -19,7 +19,7 @@ import (
)
var (
version = "4.24.0"
version = "4.24.2"
build = "Custom"
codename = "V2Fly, a community-driven edition of V2Ray."
intro = "A unified platform for anti-censorship."