diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-10-01 10:16:17 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-10-01 10:16:17 +0200 |
| commit | 5c6c70c8a98fbcbc815c73d111ef6ed76d771b25 (patch) | |
| tree | d9d2bf697d1304c66836b8888cd7638b086efe30 | |
| parent | ac36a074a79234d5ae4510fadeebbaf190141ba6 (diff) | |
| parent | 7597923bec998626593b46a030edc5d304c86393 (diff) | |
| download | mullvadvpn-5c6c70c8a98fbcbc815c73d111ef6ed76d771b25.tar.xz mullvadvpn-5c6c70c8a98fbcbc815c73d111ef6ed76d771b25.zip | |
Merge branch 'fix-dirty-backports' into prepare-2025.10
| -rw-r--r-- | mullvad-management-interface/src/types/conversions/relay_constraints.rs | 2 | ||||
| -rw-r--r-- | mullvad-relay-selector/src/relay_selector/helpers.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-management-interface/src/types/conversions/relay_constraints.rs b/mullvad-management-interface/src/types/conversions/relay_constraints.rs index 9be000e0cf..4e57153c51 100644 --- a/mullvad-management-interface/src/types/conversions/relay_constraints.rs +++ b/mullvad-management-interface/src/types/conversions/relay_constraints.rs @@ -65,7 +65,7 @@ impl TryFrom<&proto::OpenvpnConstraints> for mullvad_types::relay_constraints::O Ok(mullvad_constraints::OpenVpnConstraints { port: Constraint::from(match &constraints.port { - Some(port) => Some(mullvad_constraints::TransportPort::try_from(*port)?), + Some(port) => Some(mullvad_constraints::TransportPort::try_from(port.clone())?), None => None, }), }) diff --git a/mullvad-relay-selector/src/relay_selector/helpers.rs b/mullvad-relay-selector/src/relay_selector/helpers.rs index 7a684ec0f8..e2a980a126 100644 --- a/mullvad-relay-selector/src/relay_selector/helpers.rs +++ b/mullvad-relay-selector/src/relay_selector/helpers.rs @@ -150,7 +150,7 @@ pub fn get_quic_obfuscator(relay: Relay, ip_version: IpVersion) -> Option<Select IpVersion::V4 => quic.in_ipv4().map(IpAddr::from).collect(), IpVersion::V6 => quic.in_ipv6().map(IpAddr::from).collect(), }; - let &in_ip = addrs.iter().choose(&mut rand::rng())?; + let &in_ip = addrs.iter().choose(&mut thread_rng())?; let endpoint = SocketAddr::from((in_ip, quic.port())); let auth_token = quic.auth_token().to_string(); ObfuscatorConfig::Quic { |