Merge remote-tracking branch 'pro-plus/plus-pro' into Feature
# Conflicts: # .github/workflows/Alpha.yml # .github/workflows/codeql-analysis.yml # .github/workflows/docker.yml # .github/workflows/linter.yml # .github/workflows/stale.yml # Makefile # README.md # adapter/outbound/vless.go # component/dialer/dialer.go # component/geodata/geodata.go # component/geodata/router/condition.go # config/config.go # config/initial.go # constant/metadata.go # constant/path.go # constant/rule.go # constant/rule_extra.go # dns/filters.go # go.mod # go.sum # hub/executor/executor.go # hub/route/configs.go # listener/listener.go # listener/tun/dev/dev.go # listener/tun/dev/dev_darwin.go # listener/tun/dev/dev_linux.go # listener/tun/dev/dev_windows.go # listener/tun/dev/dev_windows_extra.go # listener/tun/dev/wintun/dll_windows.go # listener/tun/dev/wintun/session_windows.go # listener/tun/ipstack/gvisor/tun.go # listener/tun/ipstack/gvisor/tundns.go # listener/tun/ipstack/stack_adapter.go # listener/tun/ipstack/system/tun.go # listener/tun/tun_adapter.go # main.go # rule/base.go # rule/common/process.go # rule/geoip.go # rule/parser.go # rule/port.go # test/go.mod # test/go.sum # test/vless_test.go # transport/vless/xtls.go # tunnel/tunnel.go
This commit is contained in:
2
go.mod
2
go.mod
@ -41,6 +41,8 @@ require (
|
||||
github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect
|
||||
github.com/nxadm/tail v1.4.8 // indirect
|
||||
github.com/onsi/ginkgo v1.16.4 // indirect
|
||||
github.com/google/btree v1.0.1 // indirect
|
||||
github.com/kr/pretty v0.2.1 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect
|
||||
golang.org/x/mod v0.4.2 // indirect
|
||||
|
Reference in New Issue
Block a user