Version 3.0.1

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### v3.0.1
+* Fixed an issue migrating proxy settings from 2.10 or earlier
+
 ### v3.0.0
 * Redesigned the Settings window to improve categorization and allow for future growth
 * Separated the three “Kill Switch” setting choices into two separate settings - “VPN Kill Switch” and “Advanced Kill Switch”

daemon/src/daemon.cpp

@@ -3271,7 +3271,7 @@ void Daemon::upgradeSettings(bool existingSettingsFile)
 
     // The "proxy" setting was split up into "proxyEnabled" and "proxyType" in
     // 3.0 for consistency with split tunnel, automation, etc.
-    if(previous <= SemVersion{3, 0, 0})
+    if(previous < SemVersion{3, 0, 0})
     {
         // If there was no "proxy" value or it wasn't a string, we'll get an
         // empty value here, which is ignored.
@@ -3288,6 +3288,13 @@ void Daemon::upgradeSettings(bool existingSettingsFile)
             _settings.proxyEnabled(true);
         }
     }
+    if (_settings.proxyType() == QStringLiteral("custom") &&
+        _settings.proxyCustom().host().isEmpty()) {
+        //  if proxy type "custom" is selected but the SOCKS5 host is
+        //  empty, revert proxy type to "shadowsocks" just to avoid
+        //  the situation where the connection fails silently. PP-1062
+        _settings.proxyType(QStringLiteral("shadowsocks"));
+    }
 }
 
 void Daemon::calculateLocationPreferences()

rake/model/build.rb

@@ -8,7 +8,7 @@
 # and creates a per-component build directory for this component.
 class Build
     # The major-minor-patch parts of this version
-    VersionMMP = [3, 0, 0]
+    VersionMMP = [3, 0, 1]
     # The base major-minor-patch version, as a string
     VersionBase = "#{VersionMMP[0]}.#{VersionMMP[1]}.#{VersionMMP[2]}"
     # The prerelease tags for this build (dot-separated, excluding leading