Merge branch 'pq-retry-on-con-reset'

2 files changed, 9 insertions, 7 deletions

diff --git a/mullvad-cli/src/format.rs b/mullvad-cli/src/format.rs
index 47c05611b2..808852eb6d 100644
--- a/mullvad-cli/src/format.rs
+++ b/mullvad-cli/src/format.rs
@@ -109,14 +109,12 @@ fn format_relay_connection(relay_info: &TunnelStateRelayInfo, verbose: bool) ->
     } else {
         String::new()
     };
-    let quantum_resistant = if verbose {
-        if endpoint.quantum_resistant {
-            "\nQuantum resistant tunnel: true".to_string()
-        } else {
-            "\nQuantum resistant tunnel: false".to_string()
-        }
+    let quantum_resistant = if !verbose {
+        ""
+    } else if endpoint.quantum_resistant {
+        "\nQuantum resistant tunnel: yes"
     } else {
-        String::new()
+        "\nQuantum resistant tunnel: no"
     };
 
     let mut bridge_type = String::new();
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index e787729c04..a671f32558 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -492,6 +492,10 @@ fn should_retry(error: &tunnel::Error, retry_attempt: u32) -> bool {
     match error {
         tunnel::Error::WireguardTunnelMonitoringError(Error::CreateObfuscatorError(_)) => true,
 
+        tunnel::Error::WireguardTunnelMonitoringError(Error::PskNegotiationError(
+            talpid_tunnel_config_client::Error::GrpcConnectError(_),
+        )) => true,
+
         #[cfg(not(windows))]
         tunnel::Error::WireguardTunnelMonitoringError(Error::TunnelError(
             TunnelError::RecoverableStartWireguardError,