[PR #11] [MERGED] Merge upstream XTLS/Xray-core #15

New issue

Closed

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

bsakaguchi commented

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

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-xray-core/pull/11
Author: @ygurov
Created: 6/7/2025
Status: ✅ Merged
Merged: 6/11/2025
Merged by: @pokamest

Base: main ← Head: merge-upstream

📝 Commits (10+)

bd0841a XHTTP config: Add "extra" for sharing extra fields (#4000)
4807484 Chore: Fix versions in some *.pb.go files
1ffb8a9 Sniff: Prevent crash on QUIC sniffer panic (#3978)
5717774 TLS: Add CurvePreferences (to enable kyber768) (#3991)
85b3c23 Bump golang.org/x/net from 0.30.0 to 0.31.0 (#3999)
0df2446 v24.11.11
44b1dd0 Test: Change address for DNS over QUIC tests (#4002)
1a238cb REALITY client: Log invalid connections at warning level
48ac662 Update Dockerfile to Use Multiple Config Files (#4010)
7b4a686 Chore: Use a more direct and less error-prone return value (#4008)

📊 Changes

613 files changed (+16633 additions, -15801 deletions)

View changed files

📝 .github/ISSUE_TEMPLATE/bug_report.yml (+8 -8)
📝 .github/ISSUE_TEMPLATE/bug_report_zh.yml (+9 -9)
➕ .github/ISSUE_TEMPLATE/config.yml (+4 -0)
📝 .github/docker/Dockerfile (+57 -18)
➕ .github/docker/Dockerfile.usa (+70 -0)
➖ .github/docker/files/config.json (+0 -18)
➕ .github/workflows/release-win7.yml (+148 -0)
📝 .github/workflows/release.yml (+80 -60)
➕ .github/workflows/scheduled-assets-update.yml (+65 -0)
📝 .github/workflows/test.yml (+30 -13)
📝 .gitignore (+18 -2)
➖ Makefile (+0 -40)
📝 README.md (+31 -28)
📝 app/commander/commander.go (+6 -7)
📝 app/commander/config.pb.go (+11 -41)
➖ app/commander/errors.generated.go (+0 -9)
📝 app/commander/outbound.go (+13 -1)
📝 app/dispatcher/config.pb.go (+11 -41)
📝 app/dispatcher/default.go (+71 -43)
📝 app/dispatcher/dispatcher.go (+0 -2)

...and 80 more files

📄 Description

Note for reviewer:
Have not fully checked the actual state of CI/CD mechanisms, should be reviewed carefully prior merging. Also note XTLS/Xray-core migrated to github registry

_{🔄 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/11 **Author:** [@ygurov](https://github.com/ygurov) **Created:** 6/7/2025 **Status:** ✅ Merged **Merged:** 6/11/2025 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `main` ← **Head:** `merge-upstream` --- ### 📝 Commits (10+) - [`bd0841a`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/bd0841a75b40e77220a408f4988c988252836ef9) XHTTP config: Add "extra" for sharing extra fields (#4000) - [`4807484`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/480748403a9fa766a7003dd29fcbb281f133805c) Chore: Fix versions in some *.pb.go files - [`1ffb8a9`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/1ffb8a92cd38c7ee2e8909f5dec6f5832d3bf520) Sniff: Prevent crash on QUIC sniffer panic (#3978) - [`5717774`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/571777483ba4626c0430aefcab96b34bdc1f844e) TLS: Add CurvePreferences (to enable kyber768) (#3991) - [`85b3c23`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/85b3c2328fb553324dfbd1d9c87665549e8a45e1) Bump golang.org/x/net from 0.30.0 to 0.31.0 (#3999) - [`0df2446`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/0df2446f824dd657717d29ef99b8b47cf50b2364) v24.11.11 - [`44b1dd0`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/44b1dd0e674347691c62a13d227edf0d36b7e290) Test: Change address for DNS over QUIC tests (#4002) - [`1a238cb`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/1a238cbb7d213433942dcc6268274e0638805e23) REALITY client: Log invalid connections at warning level - [`48ac662`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/48ac662298283f15e116c84143289976b57e5bd1) Update Dockerfile to Use Multiple Config Files (#4010) - [`7b4a686`](https://github.com/amnezia-vpn/amnezia-xray-core/commit/7b4a686b7401ede2263b8cbf6136c720b6953e39) Chore: Use a more direct and less error-prone return value (#4008) ### 📊 Changes **613 files changed** (+16633 additions, -15801 deletions) <details> <summary>View changed files</summary> 📝 `.github/ISSUE_TEMPLATE/bug_report.yml` (+8 -8) 📝 `.github/ISSUE_TEMPLATE/bug_report_zh.yml` (+9 -9) ➕ `.github/ISSUE_TEMPLATE/config.yml` (+4 -0) 📝 `.github/docker/Dockerfile` (+57 -18) ➕ `.github/docker/Dockerfile.usa` (+70 -0) ➖ `.github/docker/files/config.json` (+0 -18) ➕ `.github/workflows/release-win7.yml` (+148 -0) 📝 `.github/workflows/release.yml` (+80 -60) ➕ `.github/workflows/scheduled-assets-update.yml` (+65 -0) 📝 `.github/workflows/test.yml` (+30 -13) 📝 `.gitignore` (+18 -2) ➖ `Makefile` (+0 -40) 📝 `README.md` (+31 -28) 📝 `app/commander/commander.go` (+6 -7) 📝 `app/commander/config.pb.go` (+11 -41) ➖ `app/commander/errors.generated.go` (+0 -9) 📝 `app/commander/outbound.go` (+13 -1) 📝 `app/dispatcher/config.pb.go` (+11 -41) 📝 `app/dispatcher/default.go` (+71 -43) 📝 `app/dispatcher/dispatcher.go` (+0 -2) _...and 80 more files_ </details> ### 📄 Description Note for reviewer: Have not fully checked the actual state of CI/CD mechanisms, should be reviewed carefully prior merging. Also note XTLS/Xray-core migrated to github registry --- <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:52 +00:00