Merge branch 'master' into development

ivpn · Aug 8, 2023 · 26525a3 · 26525a3
2 parents 780be69 + 9cac1f3
commit 26525a3
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,21 @@
 
 All notable changes to this project will be documented in this file.  
 
+## Version 3.11.15 - 2023-08-07
+
+[FIX] (Windows) App update check fails due to missing libraries  
+
+[Download IVPN Client for Windows](https://repo.ivpn.net/windows/bin/IVPN-Client-v3.11.15.exe)  
+SHA256: 1e1388c66062531970dcb8534df84c6600ffba79966a18486a83a9d2695b3945 
+
 ## Version 3.11.14 - 2023-08-07
 
 [NEW]  AntiTracker Plus additional block lists  
 [IMPROVED] Anonymized account ID when a user sends a diagnostic report  
 [FIX] Firewall occasionally OFF after autoconnect on app launch  
 [FIX] GUI: Minor text corrections  
 
-[Download IVPN Client for Windows](https://repo.ivpn.net/windows/bin/IVPN-Client-v3.11.14.exe)  
+IVPN Client for Windows  
 SHA256: 3595eb719aeb1609a6451dbe4c165ada25fe9b3c49bf49cacc592c17e7b424c6  
 
 [Download IVPN Client for macOS (Intel)](https://repo.ivpn.net/macos/bin/IVPN-3.11.14.dmg)  
@@ -37,7 +44,7 @@ SHA256: 57a6b740e1f9952f4eade5ee3139b5550ccb1c8bb792652a0b5d70ffdda9cce7
 [FIX] GUI: Switching between WireGuard servers was not possible during connection initialization  
 [FIX] Other minor issues and improvements  
 
-[Download IVPN Client for Windows](https://repo.ivpn.net/windows/bin/IVPN-Client-v3.11.5.exe)  
+IVPN Client for Windows  
 SHA256: db31a850ba820a075e808869cbaf00c6f11f433018504ed5ad307911d55bca10  
 
 [Download IVPN Client for macOS (Intel)](https://repo.ivpn.net/macos/bin/IVPN-3.11.5.dmg)  

diff --git a/daemon/.vscode/launch.json b/daemon/.vscode/launch.json
@@ -15,7 +15,7 @@
             "env": {},
             "args": ["-debug_install_dir=${workspaceRoot}", "-logging"],
             //"buildFlags": "-tags debug",
-            "buildFlags": "-buildvcs=false -tags debug -ldflags '-X github.com/ivpn/desktop-app/daemon/version._version=3.11.14'"
+            "buildFlags": "-buildvcs=false -tags debug -ldflags '-X github.com/ivpn/desktop-app/daemon/version._version=3.11.15'"
             //"buildFlags": ""
             //"buildFlags": "-tags nowifi"
         }

diff --git a/daemon/References/Windows/OpenVPN/x86_64/libcrypto-1_1-x64.dll b/daemon/References/Windows/OpenVPN/x86_64/libcrypto-1_1-x64.dll
diff --git a/daemon/References/Windows/OpenVPN/x86_64/libssl-1_1-x64.dll b/daemon/References/Windows/OpenVPN/x86_64/libssl-1_1-x64.dll
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -55,7 +55,7 @@
 name: ivpn # you probably want to 'snapcraft register <name>'
 base: core20 # the base snap is the execution environment for this snap
 # TODO: Set 'version:' to the same value as in 'ui/package.json'. This value will be used to stamp version for CLI and daemon
-version: "3.11.14"
+version: "3.11.15"
 
 title: IVPN
 summary: IVPN - Secure VPN for Privacy  # 79 char long summary

diff --git a/ui/References/Windows/Installer/release-files.txt b/ui/References/Windows/Installer/release-files.txt
@@ -12,6 +12,8 @@ OpenVPN\x86_64\openssl.exe
 OpenVPN\x86_64\openvpn.exe
 OpenVPN\x86_64\libssl-3-x64.dll
 OpenVPN\x86_64\libcrypto-3-x64.dll
+OpenVPN\x86_64\libcrypto-1_1-x64.dll
+OpenVPN\x86_64\libssl-1_1-x64.dll
 OpenVPN\x86_64\vcruntime140.dll
 OpenVPN\x86_64\tap\license.txt
 OpenVPN\x86_64\tap\OemVista.inf

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ivpn-ui",
-  "version": "3.11.14",
+  "version": "3.11.15",
   "productName": "IVPN",
   "description": "IVPN Client",
   "author": "IVPN Limited",

diff --git a/ui/src/config.js b/ui/src/config.js
@@ -33,7 +33,7 @@ function GetResourcesPath() {
 }
 
 export default {
-  MinRequiredDaemonVer: "3.11.14",
+  MinRequiredDaemonVer: "3.11.15",
 
   MinimizedUIWidth: 320,
   MaximizedUIWidth: 800,