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

New issue

Closed

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

bsakaguchi commented

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

Owner

📋 Pull Request Information

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

Base: main ← Head: chore/sync-upstream

📝 Commits (6)

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
93161c6 Merge remote-tracking branch 'xtls/main' into chore/sync-upstream

📊 Changes

124 files changed (+7537 additions, -2204 deletions)

View changed files

📝 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 (+2 -3)
📝 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)
📝 common/platform/platform.go (+2 -0)
📝 common/strmatcher/ac_automaton_matcher.go (+61 -61)
📝 common/strmatcher/matchers.go (+10 -6)
📝 common/strmatcher/mph_matcher.go (+57 -53)
➕ common/strmatcher/mph_matcher_compact.go (+47 -0)
📝 common/strmatcher/strmatcher.go (+44 -11)
➕ common/utils/padding.go (+24 -0)
📝 core/core.go (+1 -1)
📝 infra/conf/router.go (+8 -0)
📝 infra/conf/transport_authenticators.go (+0 -55)
📝 infra/conf/transport_internet.go (+254 -38)

...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/17 **Author:** [@ygurov](https://github.com/ygurov) **Created:** 2/1/2026 **Status:** ✅ Merged **Merged:** 2/1/2026 **Merged by:** [@ygurov](https://github.com/ygurov) **Base:** `main` ← **Head:** `chore/sync-upstream` --- ### 📝 Commits (6) - [`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 - [`93161c6`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/93161c6ef59502d6f3496a8bbd0cd258f1ccad56) Merge remote-tracking branch 'xtls/main' into chore/sync-upstream ### 📊 Changes **124 files changed** (+7537 additions, -2204 deletions) <details> <summary>View changed files</summary> 📝 `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` (+2 -3) 📝 `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) 📝 `common/platform/platform.go` (+2 -0) 📝 `common/strmatcher/ac_automaton_matcher.go` (+61 -61) 📝 `common/strmatcher/matchers.go` (+10 -6) 📝 `common/strmatcher/mph_matcher.go` (+57 -53) ➕ `common/strmatcher/mph_matcher_compact.go` (+47 -0) 📝 `common/strmatcher/strmatcher.go` (+44 -11) ➕ `common/utils/padding.go` (+24 -0) 📝 `core/core.go` (+1 -1) 📝 `infra/conf/router.go` (+8 -0) 📝 `infra/conf/transport_authenticators.go` (+0 -55) 📝 `infra/conf/transport_internet.go` (+254 -38) _...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:56 +00:00