haidy 3c114e7cd9 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # client/control.go # client/service.go		2018-12-13 22:44:09 +08:00
..
log	new proxy type: stcp(secret tcp)	2017-06-26 03:02:33 +08:00
metric	test: add test case	2017-03-27 23:46:38 +08:00
net	更新关闭服务接口	2018-11-27 14:53:32 +08:00
util	new feature: range section for mapping range ports	2018-01-25 23:05:07 +08:00
version	bump version to v0.22.0	2018-12-09 22:06:56 +08:00
vhost	optimize	2018-08-08 11:18:38 +08:00