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
..
proxy_manager.go	improve kcp shutdown	2018-12-11 15:17:36 +08:00
proxy_wrapper.go	mv folders	2018-12-09 22:06:22 +08:00
proxy.go	Merge branch 'frp/master'	2019-03-24 08:30:06 +08:00