[PR #19] [MERGED] chore: sync upstream #21

New issue

Closed

opened 2026-10-13 21:10:58 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 21:10:58 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-xray-core/pull/19
Author: @ygurov
Created: 2/19/2026
Status: ✅ Merged
Merged: 2/19/2026
Merged by: @ygurov

Base: main ← Head: chore/sync-upstream

📝 Commits (10+)

afcfdbc Commands: Print leaf cert's SHA256 in tls ping (#5628)
61e1153 MPH domian matcher: Support building & using cache directly (instead of building from geosite.dat when Xray starts) (#5505)
5b849d5 XHTTP transport: New options for bypassing CDN's detection (#5414)
c180c59 Finalmask: Add XDNS (relies mKCP, like DNSTT), header-, mkcp- (#5560)
20cf00c v26.1.31
a6ec3b6 XHTTP transport: Fix "auto" mode with REALITY (#5638)
25d1691 Finalmask: Add XICMP (relies mKCP/QUIC or WireGuard) (#5633)
af2f048 v26.2.2
d14767d Chore: Generate *.pb.go files with protoc v6.33.5
74c726f Commands: Print CA cert's SHA256 in tls ping (#5644)

📊 Changes

156 files changed (+8836 additions, -2350 deletions)

View changed files

📝 .github/workflows/test.yml (+16 -0)
📝 app/dns/dns.go (+27 -3)
📝 app/dns/hosts.go (+48 -1)
📝 app/dns/hosts_test.go (+56 -0)
📝 app/dns/nameserver.go (+53 -18)
📝 app/dns/nameserver_doh.go (+3 -3)
📝 app/log/command/config_grpc.pb.go (+4 -4)
📝 app/observatory/burst/ping.go (+2 -0)
📝 app/observatory/command/command_grpc.pb.go (+4 -4)
📝 app/observatory/observer.go (+4 -1)
📝 app/proxyman/command/command_grpc.pb.go (+13 -13)
📝 app/router/command/command_grpc.pb.go (+2 -2)
📝 app/router/condition.go (+31 -3)
➕ app/router/condition_serialize_test.go (+167 -0)
📝 app/router/config.go (+37 -4)
➕ app/router/geosite_compact.go (+100 -0)
📝 app/stats/command/command_grpc.pb.go (+11 -11)
📝 common/platform/platform.go (+2 -0)
📝 common/strmatcher/ac_automaton_matcher.go (+61 -61)
📝 common/strmatcher/matchers.go (+10 -6)

...and 80 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-xray-core/pull/19 **Author:** [@ygurov](https://github.com/ygurov) **Created:** 2/19/2026 **Status:** ✅ Merged **Merged:** 2/19/2026 **Merged by:** [@ygurov](https://github.com/ygurov) **Base:** `main` ← **Head:** `chore/sync-upstream` --- ### 📝 Commits (10+) - [`afcfdbc`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/afcfdbca701804ac503a2b2d31c6b6cf5fe40389) Commands: Print leaf cert's SHA256 in `tls ping` (#5628) - [`61e1153`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/61e1153157074b2329ec49e7c773211a8440af32) MPH domian matcher: Support building & using cache directly (instead of building from geosite.dat when Xray starts) (#5505) - [`5b849d5`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/5b849d51a9a9a3b52fa61e75ab93ff920ac571dc) XHTTP transport: New options for bypassing CDN's detection (#5414) - [`c180c59`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/c180c5980c6881ae24344f68b02ac6200a8d6861) Finalmask: Add XDNS (relies mKCP, like DNSTT), header-*, mkcp-* (#5560) - [`20cf00c`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/20cf00c27159aea831584ffa08db63c54fbc5f54) v26.1.31 - [`a6ec3b6`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/a6ec3b6e70345795d5b53d30aee313661708ac6f) XHTTP transport: Fix "auto" mode with REALITY (#5638) - [`25d1691`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/25d16914ffa1e1ef84ce15f93a878ade3dd1839b) Finalmask: Add XICMP (relies mKCP/QUIC or WireGuard) (#5633) - [`af2f048`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/af2f0484b9c7e9ca0cfaaf79c20c647f80017cfc) v26.2.2 - [`d14767d`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/d14767d4f307dd42e6b41c4871480bcb85437b21) Chore: Generate *.pb.go files with protoc v6.33.5 - [`74c726f`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/74c726ff62e5f772436432e96aaa85c468d704dd) Commands: Print CA cert's SHA256 in `tls ping` (#5644) ### 📊 Changes **156 files changed** (+8836 additions, -2350 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/test.yml` (+16 -0) 📝 `app/dns/dns.go` (+27 -3) 📝 `app/dns/hosts.go` (+48 -1) 📝 `app/dns/hosts_test.go` (+56 -0) 📝 `app/dns/nameserver.go` (+53 -18) 📝 `app/dns/nameserver_doh.go` (+3 -3) 📝 `app/log/command/config_grpc.pb.go` (+4 -4) 📝 `app/observatory/burst/ping.go` (+2 -0) 📝 `app/observatory/command/command_grpc.pb.go` (+4 -4) 📝 `app/observatory/observer.go` (+4 -1) 📝 `app/proxyman/command/command_grpc.pb.go` (+13 -13) 📝 `app/router/command/command_grpc.pb.go` (+2 -2) 📝 `app/router/condition.go` (+31 -3) ➕ `app/router/condition_serialize_test.go` (+167 -0) 📝 `app/router/config.go` (+37 -4) ➕ `app/router/geosite_compact.go` (+100 -0) 📝 `app/stats/command/command_grpc.pb.go` (+11 -11) 📝 `common/platform/platform.go` (+2 -0) 📝 `common/strmatcher/ac_automaton_matcher.go` (+61 -61) 📝 `common/strmatcher/matchers.go` (+10 -6) _...and 80 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-13 21:10:58 +00:00