Commit 5668425b authored by gabi-250's avatar gabi-250 🤸
Browse files

Merge branch 'version-bumps' into 'main' 

Version bumps for the 1.2.4 release

Closes #1461

See merge request tpo/core/arti!2189
parents cdc0211a 87313a30

Cargo.lock

+48 −48
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" 


[[package]]

name = "arti"

version = "1.2.3"

version = "1.2.4"

dependencies = [

 "anyhow",

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


[[package]]

name = "arti-client"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "anyhow",

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


[[package]]

name = "arti-hyper"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "anyhow",

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


[[package]]

name = "arti-rpcserver"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "arti-client",

 "async-trait",
@@ -913,7 +913,7 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" 


[[package]]

name = "caret"

version = "0.4.5"

version = "0.4.6"



[[package]]

name = "cc"
@@ -1657,7 +1657,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" 


[[package]]

name = "equix"

version = "0.1.4"

version = "0.1.5"

dependencies = [

 "arrayvec",

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


[[package]]

name = "fs-mistrust"

version = "0.7.10"

version = "0.7.11"

dependencies = [

 "derive_builder_fork_arti",

 "dirs",
@@ -1950,7 +1950,7 @@ dependencies = [ 


[[package]]

name = "fslock-guard"

version = "0.1.2"

version = "0.1.3"

dependencies = [

 "fslock-arti-fork",

 "test-temp-dir",
@@ -2219,7 +2219,7 @@ dependencies = [ 


[[package]]

name = "hashx"

version = "0.1.4"

version = "0.1.5"

dependencies = [

 "arrayvec",

 "blake2",
@@ -3760,7 +3760,7 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" 


[[package]]

name = "retry-error"

version = "0.5.2"

version = "0.5.3"

dependencies = [

 "anyhow",

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


[[package]]

name = "safelog"

version = "0.3.6"

version = "0.3.7"

dependencies = [

 "derive_more",

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


[[package]]

name = "test-temp-dir"

version = "0.2.1"

version = "0.2.2"

dependencies = [

 "anyhow",

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


[[package]]

name = "tor-async-utils"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "futures",

 "futures-await-test",
@@ -4968,7 +4968,7 @@ dependencies = [ 


[[package]]

name = "tor-basic-utils"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "derive_more",

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


[[package]]

name = "tor-bytes"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "bytes",

 "digest",
@@ -4999,7 +4999,7 @@ dependencies = [ 


[[package]]

name = "tor-cell"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "bitflags 2.5.0",

 "bytes",
@@ -5024,7 +5024,7 @@ dependencies = [ 


[[package]]

name = "tor-cert"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "base64ct",

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


[[package]]

name = "tor-chanmgr"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "async-trait",

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


[[package]]

name = "tor-checkable"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "humantime 2.1.0",

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


[[package]]

name = "tor-circmgr"

version = "0.18.1"

version = "0.19.0"

dependencies = [

 "amplify",

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


[[package]]

name = "tor-config"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "derive-deftly",

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


[[package]]

name = "tor-consdiff"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "digest",

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


[[package]]

name = "tor-dirclient"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "async-compression",

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


[[package]]

name = "tor-dirmgr"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "anyhow",

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


[[package]]

name = "tor-error"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "anyhow",

 "backtrace",
@@ -5304,7 +5304,7 @@ dependencies = [ 


[[package]]

name = "tor-geoip"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "derive_more",

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


[[package]]

name = "tor-guardmgr"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "amplify",

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


[[package]]

name = "tor-hsclient"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "async-trait",

 "derive-deftly",
@@ -5405,7 +5405,7 @@ dependencies = [ 


[[package]]

name = "tor-hscrypto"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "cipher",

 "data-encoding",
@@ -5445,7 +5445,7 @@ dependencies = [ 


[[package]]

name = "tor-hsrproxy"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "derive-deftly",

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


[[package]]

name = "tor-hsservice"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "async-trait",

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


[[package]]

name = "tor-keymgr"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "amplify",

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


[[package]]

name = "tor-linkspec"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "base64ct",

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


[[package]]

name = "tor-llcrypto"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "aes",

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


[[package]]

name = "tor-log-ratelim"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "futures",

 "humantime 2.1.0",
@@ -5640,7 +5640,7 @@ dependencies = [ 


[[package]]

name = "tor-memquota"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "derive-deftly",

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


[[package]]

name = "tor-netdir"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "bitflags 2.5.0",

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


[[package]]

name = "tor-netdoc"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "amplify",

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


[[package]]

name = "tor-persist"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "amplify",

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


[[package]]

name = "tor-proto"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "asynchronous-codec",

 "bitvec",
@@ -5825,7 +5825,7 @@ dependencies = [ 


[[package]]

name = "tor-protover"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "caret",

 "thiserror",
@@ -5833,7 +5833,7 @@ dependencies = [ 


[[package]]

name = "tor-ptmgr"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "anyhow",

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


[[package]]

name = "tor-relay-selection"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "once_cell",

 "rand",
@@ -5873,7 +5873,7 @@ dependencies = [ 


[[package]]

name = "tor-rpcbase"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "assert-impl",

 "derive-deftly",
@@ -5897,7 +5897,7 @@ dependencies = [ 


[[package]]

name = "tor-rtcompat"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "async-io 2.3.2",

 "async-native-tls",
@@ -5922,7 +5922,7 @@ dependencies = [ 


[[package]]

name = "tor-rtmock"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "amplify",

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


[[package]]

name = "tor-socksproto"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "arbitrary",

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


[[package]]

name = "tor-units"

version = "0.18.0"

version = "0.19.0"

dependencies = [

 "derive_more",

 "float-cmp",

crates/arti-bench/Cargo.toml

+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.2" }

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

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

arti-client = { package = "arti-client", path = "../arti-client", version = "0.19.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.18.0" }

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

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

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

tracing = "0.1.36"

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

crates/arti-client/Cargo.toml

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

name = "arti-client"

version = "0.18.0"

version = "0.19.0"

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

edition = "2021"

rust-version = "1.70"
@@ -127,28 +127,28 @@ postage = { version = "0.5.0", default-features = false, features = ["futures-tr 
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.18.0" }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

tracing = "0.1.36"

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

] }

toml = "0.8.8"

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

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

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

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

tracing-subscriber = "0.3.0"



[package.metadata.docs.rs]

crates/arti-hyper/Cargo.toml

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

name = "arti-hyper"

version = "0.18.0"

version = "0.19.0"

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

edition = "2021"

rust-version = "1.70"
@@ -36,7 +36,7 @@ __is_nonadditive = [] 


[dependencies]

anyhow = "1.0.23"

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

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

educe = "0.4.6"

hyper = { version = "0.14", features = ["http1", "client", "runtime"] }

pin-project = "1"
@@ -44,8 +44,8 @@ thiserror = "1" 
tls-api = "0.9.0"

tls-api-native-tls = "0.9.0"

tokio = { package = "tokio", version = "1.7", features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros"] }

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

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

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

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



[target.'cfg(target_vendor="apple")'.dev-dependencies]

tls-api-openssl = "0.9.0"

crates/arti-rpcserver/Cargo.toml

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

name = "arti-rpcserver"

version = "0.18.0"

version = "0.19.0"

edition = "2021"

rust-version = "1.70"

authors = ["The Tor Project, Inc.", "eta <eta@torproject.org>"]
@@ -25,7 +25,7 @@ full = [ 
]



[dependencies]

arti-client = { path = "../arti-client", version = "0.18.0", features = ["rpc"] }

arti-client = { path = "../arti-client", version = "0.19.0", features = ["rpc"] }

async-trait = "0.1.54"

asynchronous-codec = { version = "0.7.0", features = ["json"] }

base64ct = "1.5.1"
@@ -41,13 +41,13 @@ serde = { version = "1.0.103", features = ["derive"] } 
serde_json = "1.0.50"

thiserror = "1"

tiny-keccak = { version = "2", features = ["kmac"] }

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

tor-bytes = { path = "../tor-bytes", version = "0.18.0" }

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

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

tor-proto = { path = "../tor-proto", version = "0.18.0", features = ["stream-ctrl"] }

tor-rpcbase = { path = "../tor-rpcbase", version = "0.18.0" }

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

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

tor-bytes = { path = "../tor-bytes", version = "0.19.0" }

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

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

tor-proto = { path = "../tor-proto", version = "0.19.0", features = ["stream-ctrl"] }

tor-rpcbase = { path = "../tor-rpcbase", version = "0.19.0" }

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

tracing = "0.1.36"

typetag = "0.2.7"

weak-table = "0.3.0"
@@ -55,4 +55,4 @@ zeroize = "1" 


[dev-dependencies]

futures-await-test = "0.3.0"

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