Merge from remote branch

This commit is contained in:
yaling888
2021-09-01 00:38:43 +08:00
38 changed files with 583 additions and 272 deletions

19
go.mod
View File

@ -1,6 +1,6 @@
module github.com/Dreamacro/clash
go 1.16
go 1.17
require (
github.com/Dreamacro/go-shadowsocks2 v0.1.7
@ -14,12 +14,21 @@ require (
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
github.com/xtls/go v0.0.0-20201118062508-3632bf3b7499
go.uber.org/atomic v1.8.0
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
go.uber.org/atomic v1.9.0
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
google.golang.org/protobuf v1.27.1
gopkg.in/yaml.v2 v2.4.0
gvisor.dev/gvisor v0.0.0-20210519191755-bd7eb2c99ba9
)
require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)