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.
pull/2582/head
Shelikhoo 2020-06-18 11:20:18 +08:00
commit 9e62f4a934
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
4 changed files with 5 additions and 5 deletions

View File

@ -198,7 +198,7 @@ func (c *udpConn) RemoteAddr() net.Addr {
} }
func (c *udpConn) LocalAddr() net.Addr { func (c *udpConn) LocalAddr() net.Addr {
return c.remote return c.local
} }
func (*udpConn) SetDeadline(time.Time) error { func (*udpConn) SetDeadline(time.Time) error {

View File

@ -9,7 +9,7 @@ jobs:
- checkout: self - checkout: self
- task: GoTool@0 - task: GoTool@0
inputs: inputs:
version: '1.13' version: '1.14'
- script: | - script: |
go test -p 1 -v -timeout 30m ./... go test -p 1 -v -timeout 30m ./...
workingDirectory: '$(Build.SourcesDirectory)' workingDirectory: '$(Build.SourcesDirectory)'

View File

@ -42,7 +42,7 @@ jobs:
- checkout: self - checkout: self
- task: GoTool@0 - task: GoTool@0
inputs: inputs:
version: '1.14.1' version: '1.14.4'
- script: | - script: |
bash ./testing/coverage/coverall bash ./testing/coverage/coverall
workingDirectory: '$(Build.SourcesDirectory)' workingDirectory: '$(Build.SourcesDirectory)'
@ -66,7 +66,7 @@ jobs:
- checkout: self - checkout: self
- task: GoTool@0 - task: GoTool@0
inputs: inputs:
version: '1.14.1' version: '1.14.4'
- script: | - script: |
mkdir triggersrc mkdir triggersrc
ls -I "triggersrc" | xargs cp -rf -t triggersrc ls -I "triggersrc" | xargs cp -rf -t triggersrc

View File

@ -19,7 +19,7 @@ import (
) )
var ( var (
version = "4.24.0" version = "4.24.2"
build = "Custom" build = "Custom"
codename = "V2Fly, a community-driven edition of V2Ray." codename = "V2Fly, a community-driven edition of V2Ray."
intro = "A unified platform for anti-censorship." intro = "A unified platform for anti-censorship."