Skip to content

Commit

Permalink
Merge branch 'master' of github.com:v2fly/v2ray-core
Browse files Browse the repository at this point in the history
# 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.
  • Loading branch information
xiaokangwang committed Jun 18, 2020
2 parents a26534c + 4eeb913 commit 9e62f4a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/proxyman/inbound/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core.go
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 9e62f4a

Please sign in to comment.