Commit 55512ff4 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'version-bumps-arti-v1.2.6' into 'main'

Version bumps for Arti 1.2.6

See merge request tpo/core/arti!2303
parents 95c7de81 b12219b6
Loading
Loading
Loading
Loading
+44 −44
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"

[[package]]
name = "arti"
version = "1.2.5"
version = "1.2.6"
dependencies = [
 "anyhow",
 "arti-client",
@@ -266,7 +266,7 @@ dependencies = [

[[package]]
name = "arti-client"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "anyhow",
 "async-trait",
@@ -326,11 +326,11 @@ version = "0.17.0"

[[package]]
name = "arti-relay"
version = "0.20.0"
version = "0.21.0"

[[package]]
name = "arti-rpc-client-core"
version = "0.19.0"
version = "0.21.0"
dependencies = [
 "c_str_macro",
 "caret",
@@ -349,7 +349,7 @@ dependencies = [

[[package]]
name = "arti-rpcserver"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "arti-client",
 "async-trait",
@@ -1665,7 +1665,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

[[package]]
name = "equix"
version = "0.1.5"
version = "0.1.6"
dependencies = [
 "arrayvec",
 "hashx",
@@ -1900,7 +1900,7 @@ dependencies = [

[[package]]
name = "fs-mistrust"
version = "0.7.11"
version = "0.7.12"
dependencies = [
 "derive_builder_fork_arti",
 "dirs",
@@ -1937,7 +1937,7 @@ dependencies = [

[[package]]
name = "fslock-guard"
version = "0.1.3"
version = "0.1.4"
dependencies = [
 "fslock-arti-fork",
 "test-temp-dir",
@@ -4944,7 +4944,7 @@ dependencies = [

[[package]]
name = "tor-async-utils"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "futures",
 "futures-await-test",
@@ -4956,7 +4956,7 @@ dependencies = [

[[package]]
name = "tor-basic-utils"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "derive_more",
 "educe",
@@ -4972,7 +4972,7 @@ dependencies = [

[[package]]
name = "tor-bytes"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "bytes",
 "digest",
@@ -4987,7 +4987,7 @@ dependencies = [

[[package]]
name = "tor-cell"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "bitflags 2.6.0",
 "bytes",
@@ -5012,7 +5012,7 @@ dependencies = [

[[package]]
name = "tor-cert"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "base64ct",
 "caret",
@@ -5030,7 +5030,7 @@ dependencies = [

[[package]]
name = "tor-chanmgr"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "async-trait",
 "derive_builder_fork_arti",
@@ -5065,7 +5065,7 @@ dependencies = [

[[package]]
name = "tor-checkable"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "humantime",
 "signature",
@@ -5075,7 +5075,7 @@ dependencies = [

[[package]]
name = "tor-circmgr"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "amplify",
 "async-trait",
@@ -5124,7 +5124,7 @@ dependencies = [

[[package]]
name = "tor-config"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "derive-deftly",
 "derive_builder_fork_arti",
@@ -5167,7 +5167,7 @@ dependencies = [

[[package]]
name = "tor-consdiff"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "digest",
 "hex",
@@ -5177,7 +5177,7 @@ dependencies = [

[[package]]
name = "tor-dirclient"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "async-compression",
 "base64ct",
@@ -5205,7 +5205,7 @@ dependencies = [

[[package]]
name = "tor-dirmgr"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "anyhow",
 "async-trait",
@@ -5263,7 +5263,7 @@ dependencies = [

[[package]]
name = "tor-error"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "anyhow",
 "backtrace",
@@ -5294,7 +5294,7 @@ dependencies = [

[[package]]
name = "tor-geoip"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "derive_more",
 "once_cell",
@@ -5304,7 +5304,7 @@ dependencies = [

[[package]]
name = "tor-guardmgr"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "amplify",
 "base64ct",
@@ -5350,7 +5350,7 @@ dependencies = [

[[package]]
name = "tor-hsclient"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "async-trait",
 "derive-deftly",
@@ -5395,7 +5395,7 @@ dependencies = [

[[package]]
name = "tor-hscrypto"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "cipher",
 "data-encoding",
@@ -5435,7 +5435,7 @@ dependencies = [

[[package]]
name = "tor-hsrproxy"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "derive-deftly",
 "derive_builder_fork_arti",
@@ -5461,7 +5461,7 @@ dependencies = [

[[package]]
name = "tor-hsservice"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "async-trait",
 "base64ct",
@@ -5522,7 +5522,7 @@ dependencies = [

[[package]]
name = "tor-keymgr"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "amplify",
 "arrayvec",
@@ -5554,7 +5554,7 @@ dependencies = [

[[package]]
name = "tor-linkspec"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "base64ct",
 "by_address",
@@ -5580,7 +5580,7 @@ dependencies = [

[[package]]
name = "tor-llcrypto"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "aes",
 "base64ct",
@@ -5616,7 +5616,7 @@ dependencies = [

[[package]]
name = "tor-log-ratelim"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "futures",
 "humantime",
@@ -5630,7 +5630,7 @@ dependencies = [

[[package]]
name = "tor-memquota"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "derive-deftly",
 "derive_builder_fork_arti",
@@ -5657,7 +5657,7 @@ dependencies = [

[[package]]
name = "tor-netdir"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "bitflags 2.6.0",
 "derive_more",
@@ -5692,7 +5692,7 @@ dependencies = [

[[package]]
name = "tor-netdoc"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "amplify",
 "anyhow",
@@ -5738,7 +5738,7 @@ dependencies = [

[[package]]
name = "tor-persist"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "amplify",
 "anyhow",
@@ -5767,7 +5767,7 @@ dependencies = [

[[package]]
name = "tor-proto"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "asynchronous-codec",
 "bitvec",
@@ -5819,7 +5819,7 @@ dependencies = [

[[package]]
name = "tor-protover"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "caret",
 "thiserror",
@@ -5827,7 +5827,7 @@ dependencies = [

[[package]]
name = "tor-ptmgr"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "anyhow",
 "async-trait",
@@ -5853,7 +5853,7 @@ dependencies = [

[[package]]
name = "tor-relay-selection"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "once_cell",
 "rand",
@@ -5867,7 +5867,7 @@ dependencies = [

[[package]]
name = "tor-rpcbase"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "assert-impl",
 "derive-deftly",
@@ -5892,7 +5892,7 @@ dependencies = [

[[package]]
name = "tor-rtcompat"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "async-io 2.3.3",
 "async-native-tls",
@@ -5918,7 +5918,7 @@ dependencies = [

[[package]]
name = "tor-rtmock"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "amplify",
 "async-trait",
@@ -5947,7 +5947,7 @@ dependencies = [

[[package]]
name = "tor-socksproto"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "arbitrary",
 "caret",
@@ -5960,7 +5960,7 @@ dependencies = [

[[package]]
name = "tor-units"
version = "0.20.0"
version = "0.21.0"
dependencies = [
 "derive_more",
 "float-cmp",
+4 −4
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ publish = false

[dependencies]
anyhow = "1.0.23"
arti = { path = "../arti", version = "1.2.5" }
arti-client = { package = "arti-client", path = "../arti-client", version = "0.20.0" }
arti = { path = "../arti", version = "1.2.6" }
arti-client = { package = "arti-client", path = "../arti-client", version = "0.21.0" }
clap = { version = "4.3.24", features = ["wrap_help"] }
float-ord = "0.3"
fs-mistrust = { path = "../fs-mistrust", version = "0.7.9" }
@@ -28,8 +28,8 @@ serde = { version = "1.0.103", features = ["derive"] }
serde_json = "1.0.50"
tokio = { version = "1.7", features = ["full"] }
tokio-socks = "0.5"
tor-config = { path = "../tor-config", version = "0.20.0" }
tor-rtcompat = { path = "../tor-rtcompat", version = "0.20.0", features = ["tokio", "native-tls"] }
tor-config = { path = "../tor-config", version = "0.21.0" }
tor-rtcompat = { path = "../tor-rtcompat", version = "0.21.0", features = ["tokio", "native-tls"] }
tracing = "0.1.36"
tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

+25 −25
Original line number Diff line number Diff line
[package]
name = "arti-client"
version = "0.20.0"
version = "0.21.0"
authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]
edition = "2021"
rust-version = "1.70"
@@ -129,28 +129,28 @@ rand = "0.8"
safelog = { path = "../safelog", version = "0.3.6" }
serde = { version = "1.0.103", features = ["derive"] }
thiserror = "1"
tor-async-utils = { path = "../tor-async-utils", version = "0.20.0" }
tor-basic-utils = { path = "../tor-basic-utils", version = "0.20.0" }
tor-chanmgr = { path = "../tor-chanmgr", version = "0.20.0" }
tor-circmgr = { path = "../tor-circmgr", version = "0.20.0" }
tor-config = { path = "../tor-config", version = "0.20.0" }
tor-dirmgr = { path = "../tor-dirmgr", version = "0.20.0", default-features = false, features = ["mmap"] }
tor-error = { path = "../tor-error", version = "0.20.0", features = ["tracing"] }
tor-geoip = { path = "../tor-geoip", version = "0.20.0", optional = true }
tor-guardmgr = { path = "../tor-guardmgr", version = "0.20.0" }
tor-hsclient = { path = "../tor-hsclient", version = "0.20.0", optional = true }
tor-hscrypto = { path = "../tor-hscrypto", version = "0.20.0", optional = true }
tor-hsservice = { path = "../tor-hsservice", version = "0.20.0", optional = true }
tor-keymgr = { path = "../tor-keymgr", version = "0.20.0", default-features = false }
tor-linkspec = { path = "../tor-linkspec", version = "0.20.0" }
tor-llcrypto = { path = "../tor-llcrypto", version = "0.20.0" }
tor-netdir = { path = "../tor-netdir", version = "0.20.0" }
tor-netdoc = { path = "../tor-netdoc", version = "0.20.0" }
tor-persist = { path = "../tor-persist", version = "0.20.0" }
tor-proto = { path = "../tor-proto", version = "0.20.0" }
tor-ptmgr = { path = "../tor-ptmgr", version = "0.20.0", optional = true }
tor-rpcbase = { path = "../tor-rpcbase", version = "0.20.0", optional = true }
tor-rtcompat = { path = "../tor-rtcompat", version = "0.20.0" }
tor-async-utils = { path = "../tor-async-utils", version = "0.21.0" }
tor-basic-utils = { path = "../tor-basic-utils", version = "0.21.0" }
tor-chanmgr = { path = "../tor-chanmgr", version = "0.21.0" }
tor-circmgr = { path = "../tor-circmgr", version = "0.21.0" }
tor-config = { path = "../tor-config", version = "0.21.0" }
tor-dirmgr = { path = "../tor-dirmgr", version = "0.21.0", default-features = false, features = ["mmap"] }
tor-error = { path = "../tor-error", version = "0.21.0", features = ["tracing"] }
tor-geoip = { path = "../tor-geoip", version = "0.21.0", optional = true }
tor-guardmgr = { path = "../tor-guardmgr", version = "0.21.0" }
tor-hsclient = { path = "../tor-hsclient", version = "0.21.0", optional = true }
tor-hscrypto = { path = "../tor-hscrypto", version = "0.21.0", optional = true }
tor-hsservice = { path = "../tor-hsservice", version = "0.21.0", optional = true }
tor-keymgr = { path = "../tor-keymgr", version = "0.21.0", default-features = false }
tor-linkspec = { path = "../tor-linkspec", version = "0.21.0" }
tor-llcrypto = { path = "../tor-llcrypto", version = "0.21.0" }
tor-netdir = { path = "../tor-netdir", version = "0.21.0" }
tor-netdoc = { path = "../tor-netdoc", version = "0.21.0" }
tor-persist = { path = "../tor-persist", version = "0.21.0" }
tor-proto = { path = "../tor-proto", version = "0.21.0" }
tor-ptmgr = { path = "../tor-ptmgr", version = "0.21.0", optional = true }
tor-rpcbase = { path = "../tor-rpcbase", version = "0.21.0", optional = true }
tor-rtcompat = { path = "../tor-rtcompat", version = "0.21.0" }
tracing = "0.1.36"
void = "1"

@@ -169,8 +169,8 @@ tokio-crate = { package = "tokio", version = "1.7", features = [
    "macros",
] }
toml = "0.8.8"
tor-relay-selection = { path = "../tor-relay-selection", version = "0.20.0" }
tor-rtcompat = { path = "../tor-rtcompat", version = "0.20.0", features = ["tokio", "native-tls"] }
tor-relay-selection = { path = "../tor-relay-selection", version = "0.21.0" }
tor-rtcompat = { path = "../tor-rtcompat", version = "0.21.0", features = ["tokio", "native-tls"] }
tracing-subscriber = "0.3.0"

[package.metadata.docs.rs]
+1 −1
Original line number Diff line number Diff line
[package]
name = "arti-relay"
version = "0.20.0"
version = "0.21.0"
authors = ["The Tor Project, Inc."]
edition = "2021"
rust-version = "1.70"
+2 −2
Original line number Diff line number Diff line
[package]
name = "arti-rpc-client-core"
version = "0.19.0"
version = "0.21.0"
authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]
edition = "2021"
rust-version = "1.70"
@@ -28,7 +28,7 @@ void = "1"
rand = "0.8"
rand_chacha = "0.3"
socketpair = "0.19"
tor-basic-utils = { path = "../tor-basic-utils", version = "0.20.0" }
tor-basic-utils = { path = "../tor-basic-utils", version = "0.21.0" }

[features]
full = ["ffi", "caret/full"]
Loading