Commit graph

7 commits

Author SHA1 Message Date
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
yaling888
9ff1f5530e Feature: Trojan XTLS 2022-03-30 00:15:39 +08:00
Maze.tsz
58552447ef [fix]Linux TProxy 2021-12-04 14:34:01 +08:00
Dreamacro
df3a491d40 Feature: support trojan websocket 2021-10-16 20:19:59 +08:00
Dreamacro
91ed0118f6 Test: add basic protocol benchmark 2021-07-18 17:23:30 +08:00
Dreamacro
045edc188c Style: code style 2021-06-10 14:05:56 +08:00
Dreamacro
d5e52bed43 Feature: add protocol test 2021-05-17 20:33:00 +08:00