Merge pull request #1301 from felixonmars/devendor-socks

Use h12.io/socks instead of vendored old one
2018-10-06 13:46:08 +02:00 · 2018-10-06 13:46:08 +02:00 · 35557cc175
parent ce4aee72b6 67ee589e92
commit 35557cc175
3 changed files with 1 additions and 5 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "vendor/h12.me/socks"]
-	path = vendor/h12.me/socks
-	url = https://github.com/h12w/socks
--- a/testing/scenarios/socks_test.go
+++ b/testing/scenarios/socks_test.go
@ -6,7 +6,7 @@ import (
 	"v2ray.com/core/app/router"

 	xproxy "golang.org/x/net/proxy"
-	socks4 "h12.me/socks"
+	socks4 "h12.io/socks"
 	"v2ray.com/core"
 	"v2ray.com/core/app/proxyman"
 	"v2ray.com/core/common/net"
--- a/vendor/h12.me/socks
+++ b/vendor/h12.me/socks
@ -1 +0,0 @@
-Subproject commit fa8c79229fbda5e9996dd91341b9fc023aa5d33a
				`@ -1 +0,0 @@`
				`Subproject commit fa8c79229fbda5e9996dd91341b9fc023aa5d33a`