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/trojan.go
+++ b/adapter/outbound/trojan.go
@ -189,6 +189,7 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 			tp:    C.Trojan,
 			udp:   option.UDP,
 			iface: option.Interface,
+			rmark: option.RoutingMark,
 		},
 		instance: trojan.New(tOption),
 		option:   &option,