From 67ee589e920476c2b83fdd8dcdd222f7b9e02eab Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Sat, 6 Oct 2018 07:34:07 +0800 Subject: [PATCH] Use h12.io/socks instead of vendored old one --- .gitmodules | 3 --- testing/scenarios/socks_test.go | 2 +- vendor/h12.me/socks | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 .gitmodules delete mode 160000 vendor/h12.me/socks diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 803988f56..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/h12.me/socks"] - path = vendor/h12.me/socks - url = https://github.com/h12w/socks diff --git a/testing/scenarios/socks_test.go b/testing/scenarios/socks_test.go index 3886eed60..830c04b47 100644 --- 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" diff --git a/vendor/h12.me/socks b/vendor/h12.me/socks deleted file mode 160000 index fa8c79229..000000000 --- a/vendor/h12.me/socks +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fa8c79229fbda5e9996dd91341b9fc023aa5d33a