Merge branch 'master' into v5

This commit is contained in:
loyalsoldier
2021-02-17 08:07:12 +08:00
648 changed files with 2587 additions and 2494 deletions
+7 -7
View File
@@ -6,13 +6,13 @@ import (
"github.com/google/go-cmp/cmp"
"google.golang.org/protobuf/testing/protocmp"
"v2ray.com/core/common"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/net"
"v2ray.com/core/common/protocol"
"v2ray.com/core/common/uuid"
"v2ray.com/core/proxy/vless"
. "v2ray.com/core/proxy/vless/encoding"
"github.com/v2fly/v2ray-core/v4/common"
"github.com/v2fly/v2ray-core/v4/common/buf"
"github.com/v2fly/v2ray-core/v4/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol"
"github.com/v2fly/v2ray-core/v4/common/uuid"
"github.com/v2fly/v2ray-core/v4/proxy/vless"
. "github.com/v2fly/v2ray-core/v4/proxy/vless/encoding"
)
func toAccount(a *vless.Account) protocol.Account {