summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoakim Hulthe <joakim.hulthe@mullvad.net>2024-10-02 10:13:17 +0200
committerJoakim Hulthe <joakim.hulthe@mullvad.net>2024-10-02 10:13:17 +0200
commit1217112350515255c1933fe2e8192147d660b7f2 (patch)
tree2bbe9bc75a0dae2b5898392673b74a2b06cbc09a
parent45fc8800639f55c96f7b847fd2ccfa876d7003f7 (diff)
parent3c1988175ffa0bdcf828cf656df4c6eeb3223255 (diff)
downloadmullvadvpn-1217112350515255c1933fe2e8192147d660b7f2.tar.xz
mullvadvpn-1217112350515255c1933fe2e8192147d660b7f2.zip
Merge branch 'tonic-0-12-3'
-rw-r--r--Cargo.lock8
-rw-r--r--Cargo.toml2
-rw-r--r--test/Cargo.toml2
3 files changed, 6 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 5245ae7961..d07de1332c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4497,9 +4497,9 @@ dependencies = [
[[package]]
name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
dependencies = [
"futures-core",
"pin-project-lite",
@@ -4562,9 +4562,9 @@ dependencies = [
[[package]]
name = "tonic"
-version = "0.12.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
dependencies = [
"async-stream",
"async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index a8a0eb4f3c..3157d70d1b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,7 +69,7 @@ tokio = { version = "1.8" }
parity-tokio-ipc = "0.9"
futures = "0.3.15"
# Tonic and related crates
-tonic = "0.12.2"
+tonic = "0.12.3"
tonic-build = { version = "0.10.0", default-features = false }
tower = "0.4"
prost = "0.13.3"
diff --git a/test/Cargo.toml b/test/Cargo.toml
index fd50761e7e..52b2e0a5da 100644
--- a/test/Cargo.toml
+++ b/test/Cargo.toml
@@ -54,7 +54,7 @@ serde_json = "1.0"
tokio-serde = { version = "0.8.0", features = ["json"] }
# Tonic and related crates
-tonic = "0.12.2"
+tonic = "0.12.3"
tonic-build = { version = "0.10.0", default-features = false }
tower = "0.4"
prost = "0.13.3"