[PR #1237] [MERGED] feature/mozilla upstream #2282

New issue

Closed

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

bsakaguchi commented

2026-10-13 21:20:29 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/1237
Author: @Nethius
Created: 11/7/2024
Status: ✅ Merged
Merged: 1/13/2025
Merged by: @Nethius

Base: dev ← Head: feature/mozilla-upstream

📝 Commits (10+)

00330c4 cherry-pick 4dfcad96506fb5b88c5bb27342b6d9413fc361c9 from mozilla upstream
3265c9d cherry-pick a95fa8c088b9edaff2de18751336942c2d145a9a from mozilla
bd4fd54 cherry-pick commit 4fc1ebbad86a9abcafdc761725a7afd811c8d2d3 from mozilla
51d4aea cherry-pick 4dfcad96506fb5b88c5bb27342b6d9413fc361c9 from mozilla upstream
912daeb cherry-pick 22de4fcbd454c64ff496c3380eeaeeb6afff4d64 from mozilla upstream
3ab1635 cherry-pick 649673be561b66c96367adf379da1545f8838763 from mozilla upstream
0c4224a cherry-pick 41bdad34517d0ddaef32139482e5505d92e4b533 from mozilla upstream
c893629 cherry-pick f6e49a85538eaa230d3a8634fa7600966132ccab from mozilla upstream
bf20eb7 cherry-pick 86c585387efa0a09c7937dfe799a90a666404fcd from mozilla upstream
d02c214 cherry-pick a18c1fac740469ca3566751b74a16227518630c4 from mozilla upstream

📊 Changes

27 files changed (+1097 additions, -585 deletions)

View changed files

📝 client/daemon/daemon.cpp (+11 -9)
📝 client/daemon/daemon.h (+3 -1)
➕ client/daemon/daemonerrors.h (+17 -0)
📝 client/daemon/daemonlocalserverconnection.cpp (+2 -1)
📝 client/daemon/daemonlocalserverconnection.h (+3 -1)
📝 client/daemon/wireguardutils.h (+3 -1)
📝 client/mozilla/localsocketcontroller.cpp (+38 -3)
📝 client/platforms/linux/daemon/wireguardutilslinux.cpp (+44 -25)
📝 client/platforms/linux/daemon/wireguardutilslinux.h (+3 -0)
📝 client/platforms/macos/daemon/macosroutemonitor.cpp (+7 -7)
📝 client/platforms/macos/daemon/macosroutemonitor.h (+3 -3)
📝 client/platforms/macos/daemon/wireguardutilsmacos.cpp (+48 -29)
📝 client/platforms/macos/daemon/wireguardutilsmacos.h (+3 -0)
📝 client/platforms/windows/daemon/windowsdaemon.cpp (+39 -18)
📝 client/platforms/windows/daemon/windowsdaemon.h (+7 -3)
📝 client/platforms/windows/daemon/windowsfirewall.cpp (+113 -88)
📝 client/platforms/windows/daemon/windowsfirewall.h (+17 -9)
📝 client/platforms/windows/daemon/windowsroutemonitor.cpp (+251 -65)
📝 client/platforms/windows/daemon/windowsroutemonitor.h (+23 -8)
📝 client/platforms/windows/daemon/windowssplittunnel.cpp (+303 -137)

...and 7 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-client/pull/1237 **Author:** [@Nethius](https://github.com/Nethius) **Created:** 11/7/2024 **Status:** ✅ Merged **Merged:** 1/13/2025 **Merged by:** [@Nethius](https://github.com/Nethius) **Base:** `dev` ← **Head:** `feature/mozilla-upstream` --- ### 📝 Commits (10+) - [`00330c4`](https://github.com/amnezia-vpn/amnezia-client/commit/00330c4207ecfeda225602797a6ece972cce6d59) cherry-pick 4dfcad96506fb5b88c5bb27342b6d9413fc361c9 from mozilla upstream - [`3265c9d`](https://github.com/amnezia-vpn/amnezia-client/commit/3265c9d47acf13ae0fbc55c7e4b79737e391f262) cherry-pick a95fa8c088b9edaff2de18751336942c2d145a9a from mozilla - [`bd4fd54`](https://github.com/amnezia-vpn/amnezia-client/commit/bd4fd545fc857d37367ea45aa3e3ddbf66a39579) cherry-pick commit 4fc1ebbad86a9abcafdc761725a7afd811c8d2d3 from mozilla - [`51d4aea`](https://github.com/amnezia-vpn/amnezia-client/commit/51d4aea00cd81fe0e58908426d09e519deb5d10a) cherry-pick 4dfcad96506fb5b88c5bb27342b6d9413fc361c9 from mozilla upstream - [`912daeb`](https://github.com/amnezia-vpn/amnezia-client/commit/912daebb162ddf2d86f25a03e86a5a43b1bfac08) cherry-pick 22de4fcbd454c64ff496c3380eeaeeb6afff4d64 from mozilla upstream - [`3ab1635`](https://github.com/amnezia-vpn/amnezia-client/commit/3ab1635c3780270d7bbc714f45670eda20c6b05d) cherry-pick 649673be561b66c96367adf379da1545f8838763 from mozilla upstream - [`0c4224a`](https://github.com/amnezia-vpn/amnezia-client/commit/0c4224ae83b68fa63623bcb4ec2d15584de5fb83) cherry-pick 41bdad34517d0ddaef32139482e5505d92e4b533 from mozilla upstream - [`c893629`](https://github.com/amnezia-vpn/amnezia-client/commit/c893629074dae263e80081b5ee64909b19706b8e) cherry-pick f6e49a85538eaa230d3a8634fa7600966132ccab from mozilla upstream - [`bf20eb7`](https://github.com/amnezia-vpn/amnezia-client/commit/bf20eb79e7e7f71af9facad5f8ac21125dac4333) cherry-pick 86c585387efa0a09c7937dfe799a90a666404fcd from mozilla upstream - [`d02c214`](https://github.com/amnezia-vpn/amnezia-client/commit/d02c214609d229dff0b6b20157106aca6f92a363) cherry-pick a18c1fac740469ca3566751b74a16227518630c4 from mozilla upstream ### 📊 Changes **27 files changed** (+1097 additions, -585 deletions) <details> <summary>View changed files</summary> 📝 `client/daemon/daemon.cpp` (+11 -9) 📝 `client/daemon/daemon.h` (+3 -1) ➕ `client/daemon/daemonerrors.h` (+17 -0) 📝 `client/daemon/daemonlocalserverconnection.cpp` (+2 -1) 📝 `client/daemon/daemonlocalserverconnection.h` (+3 -1) 📝 `client/daemon/wireguardutils.h` (+3 -1) 📝 `client/mozilla/localsocketcontroller.cpp` (+38 -3) 📝 `client/platforms/linux/daemon/wireguardutilslinux.cpp` (+44 -25) 📝 `client/platforms/linux/daemon/wireguardutilslinux.h` (+3 -0) 📝 `client/platforms/macos/daemon/macosroutemonitor.cpp` (+7 -7) 📝 `client/platforms/macos/daemon/macosroutemonitor.h` (+3 -3) 📝 `client/platforms/macos/daemon/wireguardutilsmacos.cpp` (+48 -29) 📝 `client/platforms/macos/daemon/wireguardutilsmacos.h` (+3 -0) 📝 `client/platforms/windows/daemon/windowsdaemon.cpp` (+39 -18) 📝 `client/platforms/windows/daemon/windowsdaemon.h` (+7 -3) 📝 `client/platforms/windows/daemon/windowsfirewall.cpp` (+113 -88) 📝 `client/platforms/windows/daemon/windowsfirewall.h` (+17 -9) 📝 `client/platforms/windows/daemon/windowsroutemonitor.cpp` (+251 -65) 📝 `client/platforms/windows/daemon/windowsroutemonitor.h` (+23 -8) 📝 `client/platforms/windows/daemon/windowssplittunnel.cpp` (+303 -137) _...and 7 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:20:29 +00:00