Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Vecna 2024-03-19 17:29:08 -04:00
commit 2bbc0e8705
3 changed files with 8 additions and 8 deletions

12
Cargo.lock generated
View File

@ -2096,18 +2096,18 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.57" version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.57" version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2203,9 +2203,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-stream" name = "tokio-stream"
version = "0.1.14" version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"pin-project-lite", "pin-project-lite",

View File

@ -30,7 +30,7 @@ base64 = "0.21"
time = "0.3.34" time = "0.3.34"
prometheus = "0.13.3" prometheus = "0.13.3"
subtle = "2.5" subtle = "2.5"
thiserror = "1.0.57" thiserror = "1.0.58"
lox-zkp = { git = "https://gitlab.torproject.org/onyinyang/lox-zkp", version = "0.8.0" } lox-zkp = { git = "https://gitlab.torproject.org/onyinyang/lox-zkp", version = "0.8.0" }
[features] [features]

View File

@ -22,7 +22,7 @@ crc64 = "2.0.0"
sha1 = "0.10.6" sha1 = "0.10.6"
tokio = { version = "1", features = ["full", "macros"] } tokio = { version = "1", features = ["full", "macros"] }
reqwest = { version = "0.11", features = ["json", "stream"]} reqwest = { version = "0.11", features = ["json", "stream"]}
tokio-stream = "0.1.14" tokio-stream = "0.1.15"
futures = "0.3.30" futures = "0.3.30"
tokio-util = "0.7.10" tokio-util = "0.7.10"
chrono = { version = "0.4.34", features = ["serde", "clock"] } chrono = { version = "0.4.34", features = ["serde", "clock"] }