diff options
| author | Emīls <emils@mullvad.net> | 2023-06-20 16:55:57 +0200 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2023-06-20 16:55:57 +0200 |
| commit | baf88cd406978204f8cd8a6667ed8356bd87fc3f (patch) | |
| tree | 4a2077fd35272d3d9b14ee98c716cf253b203976 | |
| parent | 7cbccbc9ff029bf77d301e9ee871a101889017b2 (diff) | |
| parent | 4aa51aa11f38cf95d4008a386218c1fba8ba8526 (diff) | |
| download | mullvadvpn-baf88cd406978204f8cd8a6667ed8356bd87fc3f.tar.xz mullvadvpn-baf88cd406978204f8cd8a6667ed8356bd87fc3f.zip | |
Merge branch 'use-fixed-shadowsocks'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | ios/MullvadTransport/shadowsocks-proxy/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-api/Cargo.toml | 2 | ||||
| -rw-r--r-- | talpid-openvpn/Cargo.toml | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 18242c7052..18f27ae646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ Line wrap the file at 100 chars. Th ### Fixed - Update relay list after logging in. Previously, if the user wasn't logged in when the daemon started, the relay list would only be updated after attempting to connect to the VPN. +- Fix misaligned read in `shadowsocks` leading to a panic on some platforms. #### Android - Fix connection header flickering. diff --git a/Cargo.lock b/Cargo.lock index 61c6c83af4..32673a223e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3264,7 +3264,7 @@ dependencies = [ [[package]] name = "shadowsocks" version = "1.15.3" -source = "git+https://github.com/mullvad/shadowsocks-rust?rev=8f6afd081a9440fff2dda565908eddc27a3295f1#8f6afd081a9440fff2dda565908eddc27a3295f1" +source = "git+https://github.com/mullvad/shadowsocks-rust?rev=c45980bb22d0d50ac888813c59a1edf0cff14a36#c45980bb22d0d50ac888813c59a1edf0cff14a36" dependencies = [ "arc-swap", "async-trait", @@ -3329,7 +3329,7 @@ dependencies = [ [[package]] name = "shadowsocks-service" version = "1.15.3" -source = "git+https://github.com/mullvad/shadowsocks-rust?rev=8f6afd081a9440fff2dda565908eddc27a3295f1#8f6afd081a9440fff2dda565908eddc27a3295f1" +source = "git+https://github.com/mullvad/shadowsocks-rust?rev=c45980bb22d0d50ac888813c59a1edf0cff14a36#c45980bb22d0d50ac888813c59a1edf0cff14a36" dependencies = [ "arc-swap", "async-trait", diff --git a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml index 48f2c92539..4edc6f36be 100644 --- a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml +++ b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml @@ -11,7 +11,7 @@ bench = false [dependencies] shadowsocks-service.git = "https://github.com/mullvad/shadowsocks-rust" -shadowsocks-service.rev = "8f6afd081a9440fff2dda565908eddc27a3295f1" +shadowsocks-service.rev = "c45980bb22d0d50ac888813c59a1edf0cff14a36" shadowsocks-service.features = [ "local", "stream-cipher", "local-http", "local-tunnel" ] tokio = "1" diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml index fb40f49022..4d58eab00c 100644 --- a/mullvad-api/Cargo.toml +++ b/mullvad-api/Cargo.toml @@ -32,4 +32,4 @@ mullvad-types = { path = "../mullvad-types" } talpid-types = { path = "../talpid-types" } talpid-time = { path = "../talpid-time" } -shadowsocks = { git = "https://github.com/mullvad/shadowsocks-rust", rev = "8f6afd081a9440fff2dda565908eddc27a3295f1", features = [ "stream-cipher" ] } +shadowsocks = { git = "https://github.com/mullvad/shadowsocks-rust", rev = "c45980bb22d0d50ac888813c59a1edf0cff14a36", features = [ "stream-cipher" ] } diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml index 16fa1c7e8a..3fb3e847b1 100644 --- a/talpid-openvpn/Cargo.toml +++ b/talpid-openvpn/Cargo.toml @@ -26,7 +26,7 @@ talpid-tunnel = { path = "../talpid-tunnel" } talpid-types = { path = "../talpid-types" } uuid = { version = "0.8", features = ["v4"] } tokio = { version = "1.8", features = ["process", "rt-multi-thread", "fs"] } -shadowsocks-service = { git = "https://github.com/mullvad/shadowsocks-rust", rev = "8f6afd081a9440fff2dda565908eddc27a3295f1", features = [ "local", "stream-cipher" ] } +shadowsocks-service = { git = "https://github.com/mullvad/shadowsocks-rust", rev = "c45980bb22d0d50ac888813c59a1edf0cff14a36", features = [ "local", "stream-cipher" ] } [target.'cfg(not(target_os="android"))'.dependencies] byteorder = "1" |