haidy edaaafbf9c Merge branch 'frp/master' ... # Conflicts: # client/control.go # cmd/frpc/sub/root.go # server/proxy.go # server/service.go		2019-01-17 21:45:16 +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	support ipv6	2019-01-04 22:21:57 +08:00