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
..
acl.js	core,presets: move tracker preset to core	2018-02-18 17:44:12 +08:00
config.js	Merge branch 'master' into feature-http2-transport	2018-06-15 23:12:07 +08:00
hub.js	Merge branch 'master' into feature-http2-transport	2018-06-15 23:12:07 +08:00
index.js	core: add speed-tester, fix speed measurement	2018-05-06 10:07:36 +08:00
mux-relay.js	core: refactor	2018-05-04 22:09:06 +08:00
pipe.js	core: refactor	2018-05-04 22:09:06 +08:00
relay.js	Merge branch 'master' into feature-http2-transport	2018-06-15 23:12:07 +08:00
speed-tester.js	core: add speed-tester, fix speed measurement	2018-05-06 10:07:36 +08:00
tracker.js	core/tracker: add setSourceAddress(host, port)	2018-04-07 14:27:49 +08:00