haidy d51527959b Merge branch 'frp/master' ... # Conflicts: # client/control.go # client/proxy/proxy.go # client/service.go # client/visitor.go # server/service.go		2019-03-24 08:30:06 +08:00
..
http.go	frpc/cmd: update protocol description	2019-01-26 12:52:12 +08:00
https.go	frpc/cmd: update protocol description	2019-01-26 12:52:12 +08:00
reload.go	fix api	2019-02-11 14:37:52 +08:00
root.go	合并最新代码	2019-03-05 22:31:51 +08:00
status.go	frpc: fixup ini config parse problem in sub command status and reload.	2019-01-16 13:12:25 +08:00
stcp.go	frpc/cmd: update protocol description	2019-01-26 12:52:12 +08:00
tcp.go	cmd: support more cli command	2018-04-23 02:00:25 +08:00
udp.go	frpc/cmd: update protocol description	2019-01-26 12:52:12 +08:00
xtcp.go	fix xtcp cmd	2019-03-03 23:44:44 +08:00