haidy 59aa7cd710 Merge branch 'frp/master' ... # Conflicts: # client/admin_api.go # client/control.go # client/proxy/proxy.go # client/service.go # client/visitor.go # cmd/frpc/sub/root.go # server/service.go		2019-10-03 14:19:23 +08:00
..
proxy_manager.go	Pass client configuration as an argument	2019-08-20 14:08:01 -07:00
proxy_wrapper.go	Pass client configuration as an argument	2019-08-20 14:08:01 -07:00
proxy.go	Merge branch 'frp/master'	2019-10-03 14:19:23 +08:00