MetaCubeX 81c5a65f23 Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha ... # Conflicts: # README.md # adapter/outbound/trojan.go # adapter/outbound/vless.go # transport/trojan/trojan.go		2022-03-30 13:15:45 +08:00
..
base.go	Feature: mark on socket (#1705)	2021-11-08 16:59:48 +08:00
direct.go	Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha	2022-03-30 13:15:45 +08:00
http.go	Fix: routing-mark option doesn't work on proxies (#2028)	2022-03-19 13:29:30 +08:00
pass.go	[commit]	2022-03-27 23:44:51 +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	Feature: Trojan XTLS	2022-03-30 00:15:39 +08:00
util.go	Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha	2022-03-30 13:15:45 +08:00
vless.go	Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha	2022-03-30 13:15:45 +08:00
vmess.go	Merge branch 'ogn-dev' into with-tun	2022-03-20 21:26:25 +08:00