diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-07-13 16:32:36 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-07-13 16:32:36 +0200 |
| commit | 0e584fda28dae6586ff5290c7a0f6b265d66ff4c (patch) | |
| tree | 72b520bcc2a23f5e2ae132017577520c47753c46 | |
| parent | f1bd5b3ab2d6d7f5b9201994299a71612d5b7a2c (diff) | |
| parent | ae64a97c0ad543af96cfc35624651ad24789ad87 (diff) | |
| download | mullvadvpn-0e584fda28dae6586ff5290c7a0f6b265d66ff4c.tar.xz mullvadvpn-0e584fda28dae6586ff5290c7a0f6b265d66ff4c.zip | |
Merge branch 'update-wintun'
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| m--------- | dist-assets/binaries | 0 | ||||
| -rw-r--r-- | dist-assets/windows/installer.nsh | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e2652e8d9..d53fa6e444 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,9 @@ Line wrap the file at 100 chars. Th - Show a system notification when the account time will soon run out. - Changed how the Select Location screen scrolls so that more items can be viewed at the same time. +#### Windows +- Upgrade Wintun from 0.7 to 0.8.1. + ### Fixed #### Windows - Fix window flickering by disabling window animations. diff --git a/dist-assets/binaries b/dist-assets/binaries -Subproject f9c55513f372de96223fad3ab6bd2aa78d51738 +Subproject b82a3e9a7717b8b15c339bc78d4a2f3c6d90ea5 diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index d14bc23740..00682a569c 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -74,7 +74,7 @@ !macro ExtractWintun SetOutPath "$TEMP" - File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\wintun\mullvad-wintun-amd64.msi" + File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\mullvad-wintun-amd64.msi" !macroend |