4 Commits

Author	SHA1	Message	Date
rui.zheng	7b509bc49d	merge 2.4 branch	2017-08-05 18:25:20 +08:00
rui.zheng	a28b03d9ee	fix typo	2017-08-05 16:03:32 +08:00
rui.zheng	0c050c7d30	add obfs4 tunnel support	2017-08-05 15:46:22 +08:00
isofew	7f4b074d62	support obfs4 transport	2017-07-23 00:08:25 +08:00