Micooz 9c3cf648e8 Merge branch 'master' into feature-http2-transport ... * master: (39 commits) docs: update package: bump to v3.3.1 bin: should delete more items in simple mode docs: add examples transports: set handshake timeout of ws to 10s lib: regen config: fix new URL() default port issue lint: fix package: upgrade eslint to v5.2.0 docs: add "Test Using curl" docs: update src: add client side https proxy support package: upgrade winston to v3.0.0 build: keep comments in lib/*.js ci: change NEXT_VERSION to 3.3.1 docs: update lib: regen package: bump to v3.3.0 docs: update transports,test: add "wss" transport ... # Conflicts: # src/core/config.js		2018-06-15 23:12:07 +08:00
..
core	Merge branch 'master' into feature-http2-transport	2018-06-15 23:12:07 +08:00
presets	presets: refactor index.js	2018-06-02 09:55:11 +08:00
proxies	lint: fix	2018-06-13 22:33:15 +08:00
transports	Merge branch 'master' into feature-http2-transport	2018-06-15 23:12:07 +08:00
utils	utils,test: add uint64ToBuffer()	2018-04-26 13:48:13 +08:00
constants.js	config: fix new URL() default port issue	2018-06-13 22:34:22 +08:00
index.js	src: refine api interfaces	2017-10-21 11:57:58 +08:00