MetaCubeX 2df890c4ee Merge remote-tracking branch 'clash/dev' into Alpha ... # Conflicts: # Makefile		2022-03-19 14:53:47 +08:00
..
base.go	Feature: mark on socket (#1705)	2021-11-08 16:59:48 +08:00
direct.go	[Refactor]	2022-01-18 21:09:36 +08:00
http.go	Fix: routing-mark option doesn't work on proxies (#2028)	2022-03-19 13:29:30 +08:00
reject.go	Fix: should return io.EOF immediately	2021-11-20 12:44:31 +08:00
shadowsocks.go	Fix: routing-mark option doesn't work on proxies (#2028)	2022-03-19 13:29:30 +08:00
shadowsocksr.go	Fix: routing-mark option doesn't work on proxies (#2028)	2022-03-19 13:29:30 +08:00
snell.go	Fix: routing-mark option doesn't work on proxies (#2028)	2022-03-19 13:29:30 +08:00
socks5.go	Fix: routing-mark option doesn't work on proxies (#2028)	2022-03-19 13:29:30 +08:00
trojan.go	Merge remote-tracking branch 'clash/dev' into Alpha	2022-03-19 14:53:47 +08:00
util.go	[Feat]	2022-02-04 23:33:36 +08:00
vless.go	Merge remote-tracking branch 'yaling888/with-tun' into Alpha	2022-03-17 17:41:02 +08:00
vmess.go	Merge remote-tracking branch 'clash/dev' into Alpha	2022-03-19 14:53:47 +08:00