Merge from remote branch

2021-12-09 21:38:24 +08:00
parent 8e641a4e31 78e105f3b2
commit 5657aa50cf
11 changed files with 119 additions and 38 deletions
--- a/constant/adapters.go
+++ b/constant/adapters.go
@@ -94,7 +94,6 @@ type ProxyAdapter interface {
 	// DialContext return a C.Conn with protocol which
 	// contains multiplexing-related reuse logic (if any)
 	DialContext(ctx context.Context, metadata *Metadata, opts ...dialer.Option) (Conn, error)
-
 	ListenPacketContext(ctx context.Context, metadata *Metadata, opts ...dialer.Option) (PacketConn, error)

 	// Unwrap extracts the proxy from a proxy-group. It returns nil when nothing to extract.