Update core

weblate · Nov 12, 2021 · 31e9cda · 31e9cda
1 parent ad7f070
commit 31e9cda
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/bin/update_core.sh b/bin/update_core.sh
@@ -6,8 +6,8 @@ git reset origin/main --hard
 popd
 
 pushd external/v2ray-core
-git fetch origin dev-v5main || exit 1
-git reset origin/dev-v5main --hard
+git fetch origin main || exit 1
+git reset origin/main --hard
 popd
 
 git add .
diff --git a/external/v2ray-core b/external/v2ray-core
diff --git a/library/core b/library/core
diff --git a/sager.properties b/sager.properties
@@ -1,6 +1,6 @@
 PACKAGE_NAME=io.nekohasekai.sagernet
-VERSION_NAME=0.6-beta05
-VERSION_CODE=123
+VERSION_NAME=0.6-rc01
+VERSION_CODE=124
 
 NAIVE_VERSION_NAME=95.0.4638.54-3
 NAIVE_VERSION=8
+0 −47		.github/workflows/codeql-analysis.yml
+2 −2		.github/workflows/linter.yml
+1 −1		.github/workflows/release.yml
+1 −1		.github/workflows/test.yml
+0 −1		.gitignore
+0 −128		CODE_OF_CONDUCT.md
+1 −0		app/browserforwarder/forwarder.go
+3 −1		app/dispatcher/default.go
+1 −0		app/dns/dns.go
+1 −0		app/log/log.go
+1 −0		app/observatory/burst/burstobserver.go
+4 −3		app/proxyman/outbound/handler.go
+2 −15		app/reverse/bridge.go
+1 −1		app/reverse/portal.go
+2 −2		app/router/condition.go
+0 −5		app/router/strategy_leastload_test.go
+18 −53		common/buf/buffer.go
+0 −25		common/buf/multi_buffer.go
+0 −11		common/buf/reader.go
+1 −1		common/crypto/internal/chacha_core.generated.go
+1 −1		common/crypto/salsa20.go
+2 −1		common/environment/envimpl/fs.go
+0 −9		common/mux/server.go
+4 −14		common/protocol/bittorrent/bittorrent.go
+3 −3		common/protocol/dns/sniffer.go
+4 −3		common/protocol/quic/sniff.go
+2 −1		common/registry/registry.go
+2 −1		common/serial/resolver.go
+0 −2		common/serial/typed_message.go
+0 −323		common/tlsdissector/extension.go
+0 −406		common/tlsdissector/msg.go
+0 −63		common/tlsdissector/record.go
+2 −4		common/units/bytesize.go
+2 −2		config.go
+7 −0		features/dns/client.go
+0 −1		features/routing/dispatcher.go
+18 −18		go.mod
+92 −280		go.sum
+0 −1		infra/conf/merge/merge_test.go
+2 −4		infra/conf/merge/rules.go
+7 −8		infra/conf/synthetic/dns/dns.go
+9 −6		infra/conf/synthetic/router/router_strategy.go
+4 −0		infra/conf/v2jsonpb/follower.go
+0 −2		infra/conf/v2jsonpb/followerany.go
+1 −0		main/commands/all/api/balancer_info.go
+2 −0		main/commands/all/engineering/convertpb.go
+1 −0		main/commands/all/engineering/engineering.go
+1 −2		main/commands/all/engineering/reversepb.go
+0 −1		main/commands/all/jsonv4/convert.go
+3 −1		main/commands/all/tls/ping.go
+3 −1		main/commands/all/verify.go
+2 −4		main/commands/base/command.go
+2 −19		main/commands/test.go
+1 −0		main/v2binding/v2binding.go
+2 −2		proxy/freedom/freedom.go
+1 −1		proxy/http/client.go
+1 −1		proxy/loopback/loopback.go
+7 −13		proxy/shadowsocks/client.go
+0 −7		proxy/shadowsocks/server.go
+1 −1		proxy/socks/client.go
+1 −1		proxy/trojan/client.go
+8 −9		proxy/trojan/simplified/config.go
+1 −1		proxy/vless/outbound/outbound.go
+4 −10		testing/scenarios/shadowsocks_test.go
+8 −8		transport/internet/grpc/config.pb.go
+10 −10		transport/internet/grpc/encoding/stream.pb.go
+2 −4		transport/internet/system_dialer.go
+0 −4		transport/internet/udp/dispatcher_test.go
+1 −2		v2ray_test.go
+1 −6		.github/env.sh
+3 −3		.github/workflows/debug.yml
+7 −5		build.sh
+4 −4		go.mod
+15 −10		go.sum
+1 −0		gvisor/dispatchers.go
+9 −0		gvisor/errors.generated.go
+7 −0		gvisor/gvisor.go
+3 −3		gvisor/tcp.go
+3 −3		gvisor/udp.go
+3 −3		init.sh
+0 −1		lwip/core/conn.go
+2 −2		ssr.go
+0 −1		stats.go
+3 −3		tun.go
+3 −2		v2ray.go