4701 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kslr	fdbec9a141	Revert "multiple config"	2020-01-02 01:23:56 +08:00
Kslr	b63bc067bb	Merge pull request #2152 from v2ray/revert-2148-confdir ... Revert "add arg -confdir"	2020-01-02 01:19:24 +08:00
Kslr	e6f226c64d	Revert "add arg -confdir"	2020-01-02 01:14:36 +08:00
Kslr	1cb43035f1	Merge pull request #2150 from mellow-io/fix-dns ... revert broken dns changes	2020-01-01 12:21:30 +08:00
ghost	02b658cd2b	revert broken dns changes	2020-01-01 10:23:14 +08:00
vcptr	3ca28ce2d8	Merge branch 'raymaster' into flymaster	2019-12-31 16:13:31 +08:00
Kslr	bb441a6eb1	Merge pull request #2148 from vcptr/confdir ... add arg -confdir	2019-12-31 14:25:40 +08:00
vcptr	8ccc142e7e	add comment to please codacy	2019-12-31 14:23:01 +08:00
vcptr	78b95d4bc2	fix: default env empty	2019-12-31 13:39:17 +08:00
vcptr	e50afd6e44	trim err msg	2019-12-31 13:29:25 +08:00
vcptr	c3f55dcd67	filter .json in confDir	2019-12-31 13:11:34 +08:00
vcptr	5ae47d45c2	multiconf with -confdir arg	2019-12-31 11:45:19 +08:00
Kslr	b1403e85ca	Merge pull request #2110 from tnextday/set-var-in-go-build ... Set version details use ldflags	2019-12-31 09:37:56 +08:00
vcptr	1aefd6ce40	Merge branch 'raymaster' into flymaster	2019-12-31 09:06:49 +08:00
Kslr	fd1eae75ea	Merge branch 'master' into set-var-in-go-build	2019-12-30 18:29:16 +08:00
Kslr	3c96c6ac22	Merge pull request #2124 from vcptr/newconfig ... multiple config	2019-12-30 17:22:30 +08:00
kslr	2476fd97bd	release 4.22.0	2019-12-29 17:18:34 +08:00
kslr	1868829a5e	Remove legacy script	2019-12-29 17:17:23 +08:00
Shelikhoo	30116d6433	Merge branch 'master' of github.com:v2fly/v2ray-core	2019-12-29 16:57:09 +08:00
Shelikhoo	6f22e67df4	Remove legacy release script	2019-12-29 16:55:28 +08:00
kslr	a03c4fcfb4	release 4.22.0	2019-12-29 16:55:01 +08:00
vcptr	9d1cac1680	arm release include GOARM=6	2019-12-29 13:14:08 +08:00
Shelikhoo	78d940ddac	Added Armv6 file into release zip	2019-12-29 12:48:57 +08:00
Shelikhoo	78e4d60a91	Added Armv6 file into release zip	2019-12-26 20:14:21 +08:00
Shelikhoo	4448d37c2b	Merge branch 'master' of github.com:v2ray/v2ray-core	2019-12-26 19:34:48 +08:00
vcptr	f578f0d617	add comment to please codacy	2019-12-24 01:13:10 +08:00
vcptr	a36631357c	add comments to new added code	2019-12-24 01:06:01 +08:00
tnextday	1303c1f70a	update build script	2019-12-17 18:36:10 +08:00
tnextday	e626d19ba1	set version details use ldflags	2019-12-17 15:34:13 +08:00
vcptr	f54bbb903d	fix testcase	2019-12-16 10:29:18 +08:00
vcptr	f14eb97e3c	rearrange loader	2019-12-16 10:22:17 +08:00
vcptr	3b4a4607e5	fix test case; outbound with tail appends	2019-12-15 00:14:46 +08:00
vcptr	75f0879c12	proper handle stdin	2019-12-14 23:48:56 +08:00
vcptr	1bb34bfe17	abstract type for conf load func	2019-12-14 23:48:56 +08:00
vcptr	61e95e06c0	remove unused pkg	2019-12-14 23:48:56 +08:00
vcptr	1e76123a4c	main loads multiple	2019-12-14 23:48:56 +08:00
vcptr	904db6bd61	mconfig subcommand ready	2019-12-14 23:48:56 +08:00
vcptr	7b289d16cf	conf obj override method	2019-12-14 23:48:56 +08:00
Kslr	0be2dbc37b	Merge pull request #2094 from vcptr/rfc8484 ... doh URL config accepts full path	2019-12-09 10:01:46 +08:00
vcptr	d6df5d7cf9	doh URL controls full path	2019-12-09 09:37:35 +08:00
Kslr	698b04fa2a	Merge pull request #2086 from vcptr/rfc8484 ... doh config use RFC8484 url format	2019-12-06 13:31:34 +08:00
vcptr	b4b4b3d032	doh config use RFC8484 url format	2019-12-06 12:55:14 +08:00
Kslr	cb49b2b961	Merge pull request #2059 from vcptr/testfix ... fix test err and SyscallConn detects	2019-11-27 16:45:21 +08:00
vcptr	2a78af34fd	fix: KCPLarge buffer size too small	2019-11-27 14:40:28 +08:00
vcptr	60603abee7	fix: dns test default timeout too short	2019-11-27 13:06:08 +08:00
vcptr	47660bfee2	fix win test error; dont use ReadV on file	2019-11-27 11:24:40 +08:00
vcptr	c060f9f11f	fix test read buf	2019-11-27 09:12:02 +08:00
vcptr	622591bf03	Merge branch 'raymaster' into flymaster	2019-11-27 00:16:37 +08:00
Kslr	45398c2bc9	Merge pull request #2056 from vcptr/userpkg ... user-package script allow custom codename/buildname	2019-11-26 19:21:12 +08:00
Kslr	d8a7763847	Merge pull request #2055 from vcptr/dohpr ... DOH client supported	2019-11-26 19:19:28 +08:00