Commit 7f0f16ad authored by gabi-250's avatar gabi-250 🕸️
Browse files

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

Version bumps for the 1.4.2 release

See merge request tpo/core/arti!2906
parents 288e9ec0 494a6911

Cargo.lock

+51 −51
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" 


[[package]]

name = "arti"

version = "1.4.1"

version = "1.4.2"

dependencies = [

 "anyhow",

 "arti-client",
@@ -281,7 +281,7 @@ dependencies = [ 


[[package]]

name = "arti-client"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "anyhow",

 "async-trait",
@@ -344,7 +344,7 @@ version = "0.17.0" 


[[package]]

name = "arti-relay"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "anyhow",

 "clap",
@@ -376,7 +376,7 @@ dependencies = [ 


[[package]]

name = "arti-rpc-client-core"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "caret",

 "cfg-if",
@@ -401,7 +401,7 @@ dependencies = [ 


[[package]]

name = "arti-rpcserver"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "arti-client",

 "async-trait",
@@ -2061,7 +2061,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" 


[[package]]

name = "equix"

version = "0.2.2"

version = "0.2.3"

dependencies = [

 "arrayvec",

 "hashx",
@@ -2285,7 +2285,7 @@ dependencies = [ 


[[package]]

name = "fs-mistrust"

version = "0.9.0"

version = "0.9.1"

dependencies = [

 "derive_builder_fork_arti",

 "dirs 6.0.0",
@@ -2620,7 +2620,7 @@ dependencies = [ 


[[package]]

name = "hashx"

version = "0.2.2"

version = "0.3.0"

dependencies = [

 "arrayvec",

 "blake2",
@@ -4662,7 +4662,7 @@ dependencies = [ 


[[package]]

name = "safelog"

version = "0.4.4"

version = "0.4.5"

dependencies = [

 "derive_more",

 "educe",
@@ -5370,7 +5370,7 @@ dependencies = [ 


[[package]]

name = "test-temp-dir"

version = "0.3.2"

version = "0.3.3"

dependencies = [

 "anyhow",

 "derive_more",
@@ -5625,7 +5625,7 @@ dependencies = [ 


[[package]]

name = "tor-async-utils"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "derive-deftly 1.0.1",

 "educe",
@@ -5644,7 +5644,7 @@ dependencies = [ 


[[package]]

name = "tor-basic-utils"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "derive_more",

 "educe",
@@ -5664,7 +5664,7 @@ dependencies = [ 


[[package]]

name = "tor-bytes"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "bytes",

 "derive-deftly 1.0.1",
@@ -5681,7 +5681,7 @@ dependencies = [ 


[[package]]

name = "tor-cell"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "bitflags 2.9.0",
@@ -5710,7 +5710,7 @@ dependencies = [ 


[[package]]

name = "tor-cert"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "base64ct",

 "caret",
@@ -5728,7 +5728,7 @@ dependencies = [ 


[[package]]

name = "tor-chanmgr"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "async-trait",

 "caret",
@@ -5766,7 +5766,7 @@ dependencies = [ 


[[package]]

name = "tor-checkable"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "humantime",

 "signature",
@@ -5776,7 +5776,7 @@ dependencies = [ 


[[package]]

name = "tor-circmgr"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "async-trait",
@@ -5828,7 +5828,7 @@ dependencies = [ 


[[package]]

name = "tor-config"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "cfg-if",
@@ -5864,7 +5864,7 @@ dependencies = [ 


[[package]]

name = "tor-config-path"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "assert_matches",

 "derive_builder_fork_arti",
@@ -5884,7 +5884,7 @@ dependencies = [ 


[[package]]

name = "tor-consdiff"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "digest",

 "hex",
@@ -5894,7 +5894,7 @@ dependencies = [ 


[[package]]

name = "tor-dirclient"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "async-compression",

 "base64ct",
@@ -5922,7 +5922,7 @@ dependencies = [ 


[[package]]

name = "tor-dirmgr"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "anyhow",

 "async-trait",
@@ -5982,7 +5982,7 @@ dependencies = [ 


[[package]]

name = "tor-error"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "anyhow",

 "derive_more",
@@ -6013,7 +6013,7 @@ dependencies = [ 


[[package]]

name = "tor-general-addr"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "arbitrary",

 "assert_matches",
@@ -6024,7 +6024,7 @@ dependencies = [ 


[[package]]

name = "tor-geoip"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "derive_more",

 "once_cell",
@@ -6034,7 +6034,7 @@ dependencies = [ 


[[package]]

name = "tor-guardmgr"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "base64ct",
@@ -6081,7 +6081,7 @@ dependencies = [ 


[[package]]

name = "tor-hsclient"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "async-trait",

 "derive-deftly 1.0.1",
@@ -6128,7 +6128,7 @@ dependencies = [ 


[[package]]

name = "tor-hscrypto"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "arrayvec",

 "blake2",
@@ -6161,7 +6161,7 @@ dependencies = [ 


[[package]]

name = "tor-hsrproxy"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "derive-deftly 1.0.1",

 "derive_builder_fork_arti",
@@ -6188,7 +6188,7 @@ dependencies = [ 


[[package]]

name = "tor-hsservice"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "async-trait",
@@ -6254,7 +6254,7 @@ dependencies = [ 


[[package]]

name = "tor-key-forge"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "derive-deftly 1.0.1",

 "derive_more",
@@ -6274,7 +6274,7 @@ dependencies = [ 


[[package]]

name = "tor-keymgr"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "arrayvec",
@@ -6316,7 +6316,7 @@ dependencies = [ 


[[package]]

name = "tor-linkspec"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "base64ct",

 "by_address",
@@ -6343,7 +6343,7 @@ dependencies = [ 


[[package]]

name = "tor-llcrypto"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "aes",

 "base64ct",
@@ -6387,7 +6387,7 @@ dependencies = [ 


[[package]]

name = "tor-log-ratelim"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "futures",

 "humantime",
@@ -6401,7 +6401,7 @@ dependencies = [ 


[[package]]

name = "tor-memquota"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "derive-deftly 1.0.1",

 "derive_more",
@@ -6433,7 +6433,7 @@ dependencies = [ 


[[package]]

name = "tor-netdir"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "async-trait",

 "bitflags 2.9.0",
@@ -6469,7 +6469,7 @@ dependencies = [ 


[[package]]

name = "tor-netdoc"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "anyhow",
@@ -6517,7 +6517,7 @@ dependencies = [ 


[[package]]

name = "tor-persist"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "anyhow",
@@ -6549,7 +6549,7 @@ dependencies = [ 


[[package]]

name = "tor-proto"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "asynchronous-codec",
@@ -6612,7 +6612,7 @@ dependencies = [ 


[[package]]

name = "tor-protover"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "caret",

 "paste",
@@ -6621,7 +6621,7 @@ dependencies = [ 


[[package]]

name = "tor-ptmgr"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "anyhow",

 "async-trait",
@@ -6650,7 +6650,7 @@ dependencies = [ 


[[package]]

name = "tor-relay-crypto"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "derive-deftly 1.0.1",

 "derive_more",
@@ -6666,7 +6666,7 @@ dependencies = [ 


[[package]]

name = "tor-relay-selection"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "once_cell",

 "rand 0.9.0",
@@ -6680,7 +6680,7 @@ dependencies = [ 


[[package]]

name = "tor-rpc-connect"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "assert_matches",

 "base16ct",
@@ -6709,7 +6709,7 @@ dependencies = [ 


[[package]]

name = "tor-rpcbase"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "assert-impl",

 "derive-deftly 1.0.1",
@@ -6733,7 +6733,7 @@ dependencies = [ 


[[package]]

name = "tor-rtcompat"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "arbitrary",

 "assert_matches",
@@ -6768,7 +6768,7 @@ dependencies = [ 


[[package]]

name = "tor-rtmock"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "assert_matches",
@@ -6798,7 +6798,7 @@ dependencies = [ 


[[package]]

name = "tor-socksproto"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "amplify",

 "anyhow",
@@ -6816,7 +6816,7 @@ dependencies = [ 


[[package]]

name = "tor-units"

version = "0.28.0"

version = "0.29.0"

dependencies = [

 "derive-deftly 1.0.1",

 "derive_more",

crates/arti-bench/Cargo.toml

+5 −5
Original line number Diff line number Diff line
@@ -17,19 +17,19 @@ publish = false 


[dependencies]

anyhow = "1.0.23"

arti = { path = "../arti", version = "1.4.1" }

arti-client = { package = "arti-client", path = "../arti-client", version = "0.28.0" }

arti = { path = "../arti", version = "1.4.2" }

arti-client = { package = "arti-client", path = "../arti-client", version = "0.29.0" }

clap = { version = "4.3.24", features = ["wrap_help"] }

float-ord = "0.3"

fs-mistrust = { path = "../fs-mistrust", version = "0.9.0" }

fs-mistrust = { path = "../fs-mistrust", version = "0.9.1" }

futures = "0.3.14"

rand = "0.9"

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.28.0" }

tor-rtcompat = { path = "../tor-rtcompat", version = "0.28.0", features = ["tokio", "native-tls"] }

tor-config = { path = "../tor-config", version = "0.29.0" }

tor-rtcompat = { path = "../tor-rtcompat", version = "0.29.0", features = ["tokio", "native-tls"] }

tracing = "0.1.36"

tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

crates/arti-client/Cargo.toml

+29 −29
Original line number Diff line number Diff line 
[package]

name = "arti-client"

version = "0.28.0"

version = "0.29.0"

authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]

edition = "2021"

rust-version = "1.77"
@@ -143,7 +143,7 @@ derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } 
derive_more = { version = "2.0.1", features = ["full"] }

dyn-clone = { version = "1.0.11", optional = true }

educe = "0.4.22"

fs-mistrust = { path = "../fs-mistrust", version = "0.9.0", features = ["serde"] }

fs-mistrust = { path = "../fs-mistrust", version = "0.9.1", features = ["serde"] }

futures = "0.3.14"

hostname-validator = "1.1.1"

humantime = "2"
@@ -152,34 +152,34 @@ libc = "0.2" 
once_cell = "1.9"

postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }

rand = "0.9"

safelog = { path = "../safelog", version = "0.4.2" }

safelog = { path = "../safelog", version = "0.4.5" }

serde = { version = "1.0.103", features = ["derive"] }

thiserror = "2"

tor-async-utils = { path = "../tor-async-utils", version = "0.28.0" }

tor-basic-utils = { path = "../tor-basic-utils", version = "0.28.0" }

tor-chanmgr = { path = "../tor-chanmgr", version = "0.28.0" }

tor-circmgr = { path = "../tor-circmgr", version = "0.28.0" }

tor-config = { path = "../tor-config", version = "0.28.0" }

tor-config-path = { path = "../tor-config-path", version = "0.28.0", features = ["arti-client"] }

tor-dirmgr = { path = "../tor-dirmgr", version = "0.28.0", default-features = false, features = ["mmap"] }

tor-error = { path = "../tor-error", version = "0.28.0", features = ["tracing"] }

tor-geoip = { path = "../tor-geoip", version = "0.28.0", optional = true }

tor-guardmgr = { path = "../tor-guardmgr", version = "0.28.0" }

tor-hsclient = { path = "../tor-hsclient", version = "0.28.0", optional = true }

tor-hscrypto = { path = "../tor-hscrypto", version = "0.28.0", optional = true }

tor-hsservice = { path = "../tor-hsservice", version = "0.28.0", optional = true }

tor-keymgr = { path = "../tor-keymgr", version = "0.28.0", default-features = false }

tor-linkspec = { path = "../tor-linkspec", version = "0.28.0" }

tor-llcrypto = { path = "../tor-llcrypto", version = "0.28.0" }

tor-async-utils = { path = "../tor-async-utils", version = "0.29.0" }

tor-basic-utils = { path = "../tor-basic-utils", version = "0.29.0" }

tor-chanmgr = { path = "../tor-chanmgr", version = "0.29.0" }

tor-circmgr = { path = "../tor-circmgr", version = "0.29.0" }

tor-config = { path = "../tor-config", version = "0.29.0" }

tor-config-path = { path = "../tor-config-path", version = "0.29.0", features = ["arti-client"] }

tor-dirmgr = { path = "../tor-dirmgr", version = "0.29.0", default-features = false, features = ["mmap"] }

tor-error = { path = "../tor-error", version = "0.29.0", features = ["tracing"] }

tor-geoip = { path = "../tor-geoip", version = "0.29.0", optional = true }

tor-guardmgr = { path = "../tor-guardmgr", version = "0.29.0" }

tor-hsclient = { path = "../tor-hsclient", version = "0.29.0", optional = true }

tor-hscrypto = { path = "../tor-hscrypto", version = "0.29.0", optional = true }

tor-hsservice = { path = "../tor-hsservice", version = "0.29.0", optional = true }

tor-keymgr = { path = "../tor-keymgr", version = "0.29.0", default-features = false }

tor-linkspec = { path = "../tor-linkspec", version = "0.29.0" }

tor-llcrypto = { path = "../tor-llcrypto", version = "0.29.0" }

# tor-memquota dependency is unconditional, but most of the code is behind tor-memquota/memquota

tor-memquota = { path = "../tor-memquota", version = "0.28.0", default-features = false }

tor-netdir = { path = "../tor-netdir", version = "0.28.0" }

tor-netdoc = { path = "../tor-netdoc", version = "0.28.0" }

tor-persist = { path = "../tor-persist", version = "0.28.0" }

tor-proto = { path = "../tor-proto", version = "0.28.0" }

tor-ptmgr = { path = "../tor-ptmgr", version = "0.28.0", optional = true }

tor-rpcbase = { path = "../tor-rpcbase", version = "0.28.0", optional = true }

tor-rtcompat = { path = "../tor-rtcompat", version = "0.28.0" }

tor-memquota = { path = "../tor-memquota", version = "0.29.0", default-features = false }

tor-netdir = { path = "../tor-netdir", version = "0.29.0" }

tor-netdoc = { path = "../tor-netdoc", version = "0.29.0" }

tor-persist = { path = "../tor-persist", version = "0.29.0" }

tor-proto = { path = "../tor-proto", version = "0.29.0" }

tor-ptmgr = { path = "../tor-ptmgr", version = "0.29.0", optional = true }

tor-rpcbase = { path = "../tor-rpcbase", version = "0.29.0", optional = true }

tor-rtcompat = { path = "../tor-rtcompat", version = "0.29.0" }

tracing = "0.1.36"

visibility = { version = "0.1.0", optional = true }

void = "1"
@@ -198,8 +198,8 @@ tokio-crate = { package = "tokio", version = "1.7", features = [ 
    "macros",

] }

toml = "0.8.8"

tor-relay-selection = { path = "../tor-relay-selection", version = "0.28.0" }

tor-rtcompat = { path = "../tor-rtcompat", version = "0.28.0", features = ["tokio", "native-tls"] }

tor-relay-selection = { path = "../tor-relay-selection", version = "0.29.0" }

tor-rtcompat = { path = "../tor-rtcompat", version = "0.29.0", features = ["tokio", "native-tls"] }

tracing-subscriber = "0.3.0"



[package.metadata.docs.rs]

crates/arti-relay/Cargo.toml

+15 −15
Original line number Diff line number Diff line 
[package]

name = "arti-relay"

version = "0.28.0"

version = "0.29.0"

authors = ["The Tor Project, Inc."]

edition = "2021"

rust-version = "1.77"
@@ -35,26 +35,26 @@ clap = { version = "4.3.24", features = ["string", "wrap_help", "derive"] } 
derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }

derive_more = { version = "2.0.1", features = ["full"] }

directories = "6"

fs-mistrust = { path = "../fs-mistrust", version = "0.9.0", features = ["serde"] }

fs-mistrust = { path = "../fs-mistrust", version = "0.9.1", features = ["serde"] }

once_cell = "1"

rand = "0.9.0"

safelog = { path = "../safelog", version = "0.4.2" }

safelog = { path = "../safelog", version = "0.4.5" }

serde = { version = "1.0.103", features = ["derive"] }

strum = { version = "0.27.1", features = ["derive"] }

thiserror = "2"

tor-chanmgr = { path = "../tor-chanmgr", version = "0.28.0" }

tor-config = { path = "../tor-config", version = "0.28.0" }

tor-config-path = { path = "../tor-config-path", version = "0.28.0" }

tor-error = { path = "../tor-error", version = "0.28.0" }

tor-keymgr = { path = "../tor-keymgr", version = "0.28.0", features = ["keymgr", "ephemeral-keystore"] }

tor-llcrypto = { path = "../tor-llcrypto", version = "0.28.0" }

tor-chanmgr = { path = "../tor-chanmgr", version = "0.29.0" }

tor-config = { path = "../tor-config", version = "0.29.0" }

tor-config-path = { path = "../tor-config-path", version = "0.29.0" }

tor-error = { path = "../tor-error", version = "0.29.0" }

tor-keymgr = { path = "../tor-keymgr", version = "0.29.0", features = ["keymgr", "ephemeral-keystore"] }

tor-llcrypto = { path = "../tor-llcrypto", version = "0.29.0" }

# TODO RELAY compile in memquota tracking by default?  with a calculated limit maybe, even?

tor-memquota = { version = "0.28.0", path = "../tor-memquota", default-features = false }

tor-netdir = { path = "../tor-netdir", version = "0.28.0" }

tor-netdoc = { path = "../tor-netdoc", version = "0.28.0" }

tor-proto = { path = "../tor-proto", version = "0.28.0", features = ["tokio"] }

tor-relay-crypto = { path = "../tor-relay-crypto", version = "0.28.0" }

tor-rtcompat = { path = "../tor-rtcompat", version = "0.28.0", features = ["rustls", "tokio"] }

tor-memquota = { version = "0.29.0", path = "../tor-memquota", default-features = false }

tor-netdir = { path = "../tor-netdir", version = "0.29.0" }

tor-netdoc = { path = "../tor-netdoc", version = "0.29.0" }

tor-proto = { path = "../tor-proto", version = "0.29.0", features = ["tokio"] }

tor-relay-crypto = { path = "../tor-relay-crypto", version = "0.29.0" }

tor-rtcompat = { path = "../tor-rtcompat", version = "0.29.0", features = ["rustls", "tokio"] }

tracing = "0.1.36"

tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

crates/arti-rpc-client-core/Cargo.toml

+7 −7
Original line number Diff line number Diff line 
[package]

name = "arti-rpc-client-core"

version = "0.28.0"

version = "0.29.0"

authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]

edition = "2021"

rust-version = "1.77"
@@ -21,17 +21,17 @@ caret = { path = "../caret", version = "0.5.0" } 
cfg-if = "1.0.0"

derive_more = { version = "2.0.1", features = ["full"] }

educe = "0.4.22"

fs-mistrust = { version = "0.9.0", path = "../fs-mistrust" }

fs-mistrust = { version = "0.9.1", path = "../fs-mistrust" }

paste = { version = "1", optional = true }

percent-encoding = "2.3.1"

rand = "0.9.0"

serde = { version = "1.0.103", features = ["derive"] }

serde_json = "1.0.104"

thiserror = "2"

tor-config-path = { version = "0.28.0", path = "../tor-config-path", features = ["arti-client"] }

tor-error = { version = "0.28.0", path = "../tor-error", default-features = false }

tor-rpc-connect = { version = "0.28.0", path = "../tor-rpc-connect", features = ["rpc-client"] }

tor-socksproto = { path = "../tor-socksproto", version = "0.28.0", default-features = false, features = [

tor-config-path = { version = "0.29.0", path = "../tor-config-path", features = ["arti-client"] }

tor-error = { version = "0.29.0", path = "../tor-error", default-features = false }

tor-rpc-connect = { version = "0.29.0", path = "../tor-rpc-connect", features = ["rpc-client"] }

tor-socksproto = { path = "../tor-socksproto", version = "0.29.0", default-features = false, features = [

    "client-handshake",

] }

void = "1"
@@ -39,7 +39,7 @@ void = "1" 
[dev-dependencies]

rand = "0.9"

rand_chacha = "0.9"

tor-basic-utils = { path = "../tor-basic-utils", version = "0.28.0" }

tor-basic-utils = { path = "../tor-basic-utils", version = "0.29.0" }



[target.'cfg(not(windows))'.dev-dependencies]

socketpair = "0.19"