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
..
auth	Migration: go 1.18	2022-03-16 12:10:13 +08:00
dhcp	Change: use interface HardwareAddr for dhcp discovery	2021-10-14 22:54:43 +08:00
dialer	Refactor: MainResolver	2022-03-28 00:44:13 +08:00
fakeip	Feature: flush fakeip pool	2022-03-23 01:05:43 +08:00
geodata	[commit]	2022-03-27 23:44:51 +08:00
iface	Migration: go 1.18	2022-03-16 12:10:13 +08:00
mmdb	[Skip CI]	2022-03-15 02:06:57 +08:00
nat	Fix: tunnel UDP race condition (#1043)	2020-10-28 21:26:50 +08:00
pool	Chore: Merge branch 'ogn-dev' into with-tun	2022-03-16 20:16:30 +08:00
process	[Fixed]	2022-03-26 16:17:44 +08:00
profile	Feature: flush fakeip pool	2022-03-23 01:05:43 +08:00
resolver	Refactor: MainResolver	2022-03-28 00:44:13 +08:00
trie	Merge remote-tracking branch 'clash/dev' into Alpha	2022-03-17 01:41:51 +08:00