summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOdd Stranne <odd@mullvad.net>2022-01-12 22:47:47 +0100
committerOdd Stranne <odd@mullvad.net>2022-01-12 22:47:47 +0100
commitda47c24bd42d6c5b1ee7430af68ccb145eff74d0 (patch)
tree22dede08675b0e1a554b4a4f684f7fa6fdb3d4e0
parent3cd3aa5b8a668a6e52f832cd69d7fe31264431b6 (diff)
parent775d671eaee470b032c3a0203c7b8f1e19aed47f (diff)
downloadmullvadvpn-da47c24bd42d6c5b1ee7430af68ccb145eff74d0.tar.xz
mullvadvpn-da47c24bd42d6c5b1ee7430af68ccb145eff74d0.zip
Merge branch 'update-st-driver-1-2-0-0'
-rw-r--r--CHANGELOG.md2
m---------dist-assets/binaries0
-rw-r--r--dist-assets/windows/installer.nsh4
3 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7562ea483..83564bc28c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,8 @@ Line wrap the file at 100 chars. Th
- Make wireguard-nt the default driver for WireGuard. This is used instead of wireguard-go and
Wintun.
- Increase firewall transaction timeout from 2 to 5 seconds.
+- Update split tunnel driver to 1.2.0.0. Notably, this driver release allows firewall filters
+ added by other software to block excluded apps.
### Removed
#### Windows
diff --git a/dist-assets/binaries b/dist-assets/binaries
-Subproject 0ce1cdd413319fbbf0756d339113d36391d535c
+Subproject 973ee47bec89df537b8ecae20235071055693ec
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh
index 7623db3ef8..4bc731df17 100644
--- a/dist-assets/windows/installer.nsh
+++ b/dist-assets/windows/installer.nsh
@@ -92,7 +92,9 @@
!macro ExtractSplitTunnelDriver
SetOutPath "$TEMP\mullvad-split-tunnel"
- File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\split-tunnel\win10\*"
+ File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\split-tunnel\mullvad-split-tunnel.cat"
+ File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\split-tunnel\mullvad-split-tunnel.inf"
+ File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\split-tunnel\mullvad-split-tunnel.sys"
File "${BUILD_RESOURCES_DIR}\..\windows\driverlogic\bin\x64-Release\driverlogic.exe"
!macroend