Merge remote-tracking branch 'clash/dev' into Alpha

# Conflicts: # Makefile
2022-03-19 14:53:47 +08:00
parent 520256365e 30d4668008
commit 2df890c4ee
8 changed files with 10 additions and 3 deletions
--- a/adapter/outbound/vmess.go
+++ b/adapter/outbound/vmess.go
@ -291,6 +291,7 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 			tp:    C.Vmess,
 			udp:   option.UDP,
 			iface: option.Interface,
+			rmark: option.RoutingMark,
 		},
 		client: client,
 		option: &option,