Merge branch 'version-bumps-1.3.2' into 'main' (8b1ad9ca) · Commits · Nuhiat-Arefin / Arti

Cargo.lock

+56 −56

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"

		[[package]]
		name = "arti"
		version = "1.3.1"
		version = "1.3.2"
		dependencies = [
		"anyhow",
		"arti-client",
		@@ -280,7 +280,7 @@ dependencies = [

		[[package]]
		name = "arti-client"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"anyhow",
		"async-trait",
		@@ -343,7 +343,7 @@ version = "0.17.0"

		[[package]]
		name = "arti-relay"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"anyhow",
		"clap",
		@@ -370,7 +370,7 @@ dependencies = [

		[[package]]
		name = "arti-rpc-client-core"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"caret",
		"cfg-if",
		@@ -395,7 +395,7 @@ dependencies = [

		[[package]]
		name = "arti-rpcserver"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"arti-client",
		"async-trait",
		@@ -1045,7 +1045,7 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"

		[[package]]
		name = "caret"
		version = "0.5.0"
		version = "0.5.1"

		[[package]]
		name = "cast"
		@@ -1910,7 +1910,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

		[[package]]
		name = "equix"
		version = "0.2.1"
		version = "0.2.2"
		dependencies = [
		"arrayvec",
		"hashx",
		@@ -2134,7 +2134,7 @@ dependencies = [

		[[package]]
		name = "fs-mistrust"
		version = "0.8.2"
		version = "0.8.3"
		dependencies = [
		"derive_builder_fork_arti",
		"dirs",
		@@ -2171,7 +2171,7 @@ dependencies = [

		[[package]]
		name = "fslock-guard"
		version = "0.2.1"
		version = "0.2.2"
		dependencies = [
		"fslock-arti-fork",
		"test-temp-dir",
		@@ -2453,7 +2453,7 @@ dependencies = [

		[[package]]
		name = "hashx"
		version = "0.2.1"
		version = "0.2.2"
		dependencies = [
		"arrayvec",
		"blake2",
		@@ -3490,7 +3490,7 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"

		[[package]]
		name = "oneshot-fused-workaround"
		version = "0.2.0"
		version = "0.2.1"
		dependencies = [
		"futures",
		]
		@@ -4139,7 +4139,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"

		[[package]]
		name = "retry-error"
		version = "0.6.1"
		version = "0.6.2"
		dependencies = [
		"anyhow",
		"derive_more",
		@@ -4361,7 +4361,7 @@ dependencies = [

		[[package]]
		name = "safelog"
		version = "0.4.2"
		version = "0.4.3"
		dependencies = [
		"derive_more",
		"educe",
		@@ -4794,7 +4794,7 @@ dependencies = [

		[[package]]
		name = "slotmap-careful"
		version = "0.2.2"
		version = "0.2.3"
		dependencies = [
		"paste",
		"serde",
		@@ -5075,7 +5075,7 @@ dependencies = [

		[[package]]
		name = "test-temp-dir"
		version = "0.3.0"
		version = "0.3.1"
		dependencies = [
		"anyhow",
		"derive_more",
		@@ -5329,7 +5329,7 @@ dependencies = [

		[[package]]
		name = "tor-async-utils"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"derive-deftly",
		"educe",
		@@ -5348,7 +5348,7 @@ dependencies = [

		[[package]]
		name = "tor-basic-utils"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"derive_more",
		"educe",
		@@ -5368,7 +5368,7 @@ dependencies = [

		[[package]]
		name = "tor-bytes"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"bytes",
		"derive-deftly",
		@@ -5385,7 +5385,7 @@ dependencies = [

		[[package]]
		name = "tor-cell"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"bitflags 2.6.0",
		@@ -5414,7 +5414,7 @@ dependencies = [

		[[package]]
		name = "tor-cert"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"base64ct",
		"caret",
		@@ -5432,7 +5432,7 @@ dependencies = [

		[[package]]
		name = "tor-chanmgr"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"async-trait",
		"derive_builder_fork_arti",
		@@ -5469,7 +5469,7 @@ dependencies = [

		[[package]]
		name = "tor-checkable"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"humantime",
		"signature",
		@@ -5479,7 +5479,7 @@ dependencies = [

		[[package]]
		name = "tor-circmgr"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"async-trait",
		@@ -5530,7 +5530,7 @@ dependencies = [

		[[package]]
		name = "tor-config"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"cfg-if",
		@@ -5566,7 +5566,7 @@ dependencies = [

		[[package]]
		name = "tor-config-path"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"assert_matches",
		"derive_builder_fork_arti",
		@@ -5596,7 +5596,7 @@ dependencies = [

		[[package]]
		name = "tor-consdiff"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"digest",
		"hex",
		@@ -5606,7 +5606,7 @@ dependencies = [

		[[package]]
		name = "tor-dirclient"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"async-compression",
		"base64ct",
		@@ -5634,7 +5634,7 @@ dependencies = [

		[[package]]
		name = "tor-dirmgr"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"anyhow",
		"async-trait",
		@@ -5693,7 +5693,7 @@ dependencies = [

		[[package]]
		name = "tor-error"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"anyhow",
		"derive_more",
		@@ -5724,7 +5724,7 @@ dependencies = [

		[[package]]
		name = "tor-general-addr"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"arbitrary",
		"assert_matches",
		@@ -5735,7 +5735,7 @@ dependencies = [

		[[package]]
		name = "tor-geoip"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"derive_more",
		"once_cell",
		@@ -5745,7 +5745,7 @@ dependencies = [

		[[package]]
		name = "tor-guardmgr"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"base64ct",
		@@ -5792,7 +5792,7 @@ dependencies = [

		[[package]]
		name = "tor-hsclient"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"async-trait",
		"derive-deftly",
		@@ -5839,7 +5839,7 @@ dependencies = [

		[[package]]
		name = "tor-hscrypto"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"arrayvec",
		"blake2",
		@@ -5872,7 +5872,7 @@ dependencies = [

		[[package]]
		name = "tor-hsrproxy"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"derive-deftly",
		"derive_builder_fork_arti",
		@@ -5899,7 +5899,7 @@ dependencies = [

		[[package]]
		name = "tor-hsservice"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"async-trait",
		@@ -5965,7 +5965,7 @@ dependencies = [

		[[package]]
		name = "tor-key-forge"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"derive-deftly",
		"derive_more",
		@@ -5983,7 +5983,7 @@ dependencies = [

		[[package]]
		name = "tor-keymgr"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"arrayvec",
		@@ -6021,7 +6021,7 @@ dependencies = [

		[[package]]
		name = "tor-linkspec"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"base64ct",
		"by_address",
		@@ -6048,7 +6048,7 @@ dependencies = [

		[[package]]
		name = "tor-llcrypto"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"aes",
		"base64ct",
		@@ -6087,7 +6087,7 @@ dependencies = [

		[[package]]
		name = "tor-log-ratelim"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"futures",
		"humantime",
		@@ -6101,7 +6101,7 @@ dependencies = [

		[[package]]
		name = "tor-memquota"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"derive-deftly",
		"derive_more",
		@@ -6133,7 +6133,7 @@ dependencies = [

		[[package]]
		name = "tor-netdir"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"async-trait",
		"bitflags 2.6.0",
		@@ -6169,7 +6169,7 @@ dependencies = [

		[[package]]
		name = "tor-netdoc"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"anyhow",
		@@ -6216,7 +6216,7 @@ dependencies = [

		[[package]]
		name = "tor-persist"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"anyhow",
		@@ -6248,7 +6248,7 @@ dependencies = [

		[[package]]
		name = "tor-proto"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"asynchronous-codec",
		"bitvec",
		@@ -6306,7 +6306,7 @@ dependencies = [

		[[package]]
		name = "tor-protover"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"caret",
		"thiserror 2.0.9",
		@@ -6314,7 +6314,7 @@ dependencies = [

		[[package]]
		name = "tor-ptmgr"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"anyhow",
		"async-trait",
		@@ -6343,7 +6343,7 @@ dependencies = [

		[[package]]
		name = "tor-relay-crypto"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"derive-deftly",
		"derive_more",
		@@ -6357,7 +6357,7 @@ dependencies = [

		[[package]]
		name = "tor-relay-selection"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"once_cell",
		"rand",
		@@ -6371,7 +6371,7 @@ dependencies = [

		[[package]]
		name = "tor-rpc-connect"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"assert_matches",
		"cfg-if",
		@@ -6396,7 +6396,7 @@ dependencies = [

		[[package]]
		name = "tor-rpcbase"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"assert-impl",
		"derive-deftly",
		@@ -6420,7 +6420,7 @@ dependencies = [

		[[package]]
		name = "tor-rtcompat"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"arbitrary",
		"assert_matches",
		@@ -6452,7 +6452,7 @@ dependencies = [

		[[package]]
		name = "tor-rtmock"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"async-trait",
		@@ -6481,7 +6481,7 @@ dependencies = [

		[[package]]
		name = "tor-socksproto"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"amplify",
		"anyhow",
		@@ -6499,7 +6499,7 @@ dependencies = [

		[[package]]
		name = "tor-units"
		version = "0.25.0"
		version = "0.26.0"
		dependencies = [
		"derive-deftly",
		"derive_more",

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.3.1" }
		arti-client = { package = "arti-client", path = "../arti-client", version = "0.25.0" }
		arti = { path = "../arti", version = "1.3.2" }
		arti-client = { package = "arti-client", path = "../arti-client", version = "0.26.0" }
		clap = { version = "4.3.24", features = ["wrap_help"] }
		float-ord = "0.3"
		fs-mistrust = { path = "../fs-mistrust", version = "0.8.2" }
		@@ -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.25.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.25.0", features = ["tokio", "native-tls"] }
		tor-config = { path = "../tor-config", version = "0.26.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.26.0", features = ["tokio", "native-tls"] }
		tracing = "0.1.36"
		tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

crates/arti-client/Cargo.toml

+27 −27

Original line number	Diff line number	Diff line
		[package]
		name = "arti-client"
		version = "0.25.0"
		version = "0.26.0"
		authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]
		edition = "2021"
		rust-version = "1.77"
		@@ -154,31 +154,31 @@ rand = "0.8"
		safelog = { path = "../safelog", version = "0.4.2" }
		serde = { version = "1.0.103", features = ["derive"] }
		thiserror = "2"
		tor-async-utils = { path = "../tor-async-utils", version = "0.25.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.25.0" }
		tor-chanmgr = { path = "../tor-chanmgr", version = "0.25.0" }
		tor-circmgr = { path = "../tor-circmgr", version = "0.25.0" }
		tor-config = { path = "../tor-config", version = "0.25.0" }
		tor-config-path = { path = "../tor-config-path", version = "0.25.0", features = ["arti-client"] }
		tor-dirmgr = { path = "../tor-dirmgr", version = "0.25.0", default-features = false, features = ["mmap"] }
		tor-error = { path = "../tor-error", version = "0.25.0", features = ["tracing"] }
		tor-geoip = { path = "../tor-geoip", version = "0.25.0", optional = true }
		tor-guardmgr = { path = "../tor-guardmgr", version = "0.25.0" }
		tor-hsclient = { path = "../tor-hsclient", version = "0.25.0", optional = true }
		tor-hscrypto = { path = "../tor-hscrypto", version = "0.25.0", optional = true }
		tor-hsservice = { path = "../tor-hsservice", version = "0.25.0", optional = true }
		tor-keymgr = { path = "../tor-keymgr", version = "0.25.0", default-features = false }
		tor-linkspec = { path = "../tor-linkspec", version = "0.25.0" }
		tor-llcrypto = { path = "../tor-llcrypto", version = "0.25.0" }
		tor-async-utils = { path = "../tor-async-utils", version = "0.26.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.26.0" }
		tor-chanmgr = { path = "../tor-chanmgr", version = "0.26.0" }
		tor-circmgr = { path = "../tor-circmgr", version = "0.26.0" }
		tor-config = { path = "../tor-config", version = "0.26.0" }
		tor-config-path = { path = "../tor-config-path", version = "0.26.0", features = ["arti-client"] }
		tor-dirmgr = { path = "../tor-dirmgr", version = "0.26.0", default-features = false, features = ["mmap"] }
		tor-error = { path = "../tor-error", version = "0.26.0", features = ["tracing"] }
		tor-geoip = { path = "../tor-geoip", version = "0.26.0", optional = true }
		tor-guardmgr = { path = "../tor-guardmgr", version = "0.26.0" }
		tor-hsclient = { path = "../tor-hsclient", version = "0.26.0", optional = true }
		tor-hscrypto = { path = "../tor-hscrypto", version = "0.26.0", optional = true }
		tor-hsservice = { path = "../tor-hsservice", version = "0.26.0", optional = true }
		tor-keymgr = { path = "../tor-keymgr", version = "0.26.0", default-features = false }
		tor-linkspec = { path = "../tor-linkspec", version = "0.26.0" }
		tor-llcrypto = { path = "../tor-llcrypto", version = "0.26.0" }
		# tor-memquota dependency is unconditional, but most of the code is behind tor-memquota/memquota
		tor-memquota = { path = "../tor-memquota", version = "0.25.0", default-features = false }
		tor-netdir = { path = "../tor-netdir", version = "0.25.0" }
		tor-netdoc = { path = "../tor-netdoc", version = "0.25.0" }
		tor-persist = { path = "../tor-persist", version = "0.25.0" }
		tor-proto = { path = "../tor-proto", version = "0.25.0" }
		tor-ptmgr = { path = "../tor-ptmgr", version = "0.25.0", optional = true }
		tor-rpcbase = { path = "../tor-rpcbase", version = "0.25.0", optional = true }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.25.0" }
		tor-memquota = { path = "../tor-memquota", version = "0.26.0", default-features = false }
		tor-netdir = { path = "../tor-netdir", version = "0.26.0" }
		tor-netdoc = { path = "../tor-netdoc", version = "0.26.0" }
		tor-persist = { path = "../tor-persist", version = "0.26.0" }
		tor-proto = { path = "../tor-proto", version = "0.26.0" }
		tor-ptmgr = { path = "../tor-ptmgr", version = "0.26.0", optional = true }
		tor-rpcbase = { path = "../tor-rpcbase", version = "0.26.0", optional = true }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.26.0" }
		tracing = "0.1.36"
		visibility = { version = "0.1.0", optional = true }
		void = "1"
		@@ -197,8 +197,8 @@ tokio-crate = { package = "tokio", version = "1.7", features = [
		"macros",
		] }
		toml = "0.8.8"
		tor-relay-selection = { path = "../tor-relay-selection", version = "0.25.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.25.0", features = ["tokio", "native-tls"] }
		tor-relay-selection = { path = "../tor-relay-selection", version = "0.26.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.26.0", features = ["tokio", "native-tls"] }
		tracing-subscriber = "0.3.0"

		[package.metadata.docs.rs]

crates/arti-relay/Cargo.toml

+12 −12

Original line number	Diff line number	Diff line
		[package]
		name = "arti-relay"
		version = "0.25.0"
		version = "0.26.0"
		authors = ["The Tor Project, Inc."]
		edition = "2021"
		rust-version = "1.77"
		@@ -37,18 +37,18 @@ rand = "0.8.5"
		serde = { version = "1.0.103", features = ["derive"] }
		strum = { version = "0.26.3", features = ["derive"] }
		thiserror = "2"
		tor-chanmgr = { path = "../tor-chanmgr", version = "0.25.0" }
		tor-config = { path = "../tor-config", version = "0.25.0" }
		tor-config-path = { path = "../tor-config-path", version = "0.25.0" }
		tor-error = { path = "../tor-error", version = "0.25.0" }
		tor-keymgr = { path = "../tor-keymgr", version = "0.25.0", features = ["keymgr", "ephemeral-keystore"] }
		tor-chanmgr = { path = "../tor-chanmgr", version = "0.26.0" }
		tor-config = { path = "../tor-config", version = "0.26.0" }
		tor-config-path = { path = "../tor-config-path", version = "0.26.0" }
		tor-error = { path = "../tor-error", version = "0.26.0" }
		tor-keymgr = { path = "../tor-keymgr", version = "0.26.0", features = ["keymgr", "ephemeral-keystore"] }
		# TODO RELAY compile in memquota tracking by default? with a calculated limit maybe, even?
		tor-memquota = { version = "0.25.0", path = "../tor-memquota", default-features = false }
		tor-netdir = { path = "../tor-netdir", version = "0.25.0" }
		tor-netdoc = { path = "../tor-netdoc", version = "0.25.0" }
		tor-proto = { path = "../tor-proto", version = "0.25.0", features = ["tokio"] }
		tor-relay-crypto = { path = "../tor-relay-crypto", version = "0.25.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.25.0", features = ["rustls", "tokio"] }
		tor-memquota = { version = "0.26.0", path = "../tor-memquota", default-features = false }
		tor-netdir = { path = "../tor-netdir", version = "0.26.0" }
		tor-netdoc = { path = "../tor-netdoc", version = "0.26.0" }
		tor-proto = { path = "../tor-proto", version = "0.26.0", features = ["tokio"] }
		tor-relay-crypto = { path = "../tor-relay-crypto", version = "0.26.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.26.0", features = ["rustls", "tokio"] }
		tracing = "0.1.36"

		[dev-dependencies]

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

+6 −6

Original line number	Diff line number	Diff line
		[package]
		name = "arti-rpc-client-core"
		version = "0.25.0"
		version = "0.26.0"
		authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]
		edition = "2021"
		rust-version = "1.77"
		@@ -27,10 +27,10 @@ percent-encoding = "2.3.1"
		serde = { version = "1.0.103", features = ["derive"] }
		serde_json = "1.0.104"
		thiserror = "2"
		tor-config-path = { version = "0.25.0", path = "../tor-config-path", features = ["arti-client"] }
		tor-error = { version = "0.25.0", path = "../tor-error", default-features = false }
		tor-rpc-connect = { version = "0.25.0", path = "../tor-rpc-connect", features = ["rpc-client"] }
		tor-socksproto = { path = "../tor-socksproto", version = "0.25.0", default-features = false, features = [
		tor-config-path = { version = "0.26.0", path = "../tor-config-path", features = ["arti-client"] }
		tor-error = { version = "0.26.0", path = "../tor-error", default-features = false }
		tor-rpc-connect = { version = "0.26.0", path = "../tor-rpc-connect", features = ["rpc-client"] }
		tor-socksproto = { path = "../tor-socksproto", version = "0.26.0", default-features = false, features = [
		"client-handshake",
		] }
		void = "1"
		@@ -39,7 +39,7 @@ void = "1"
		rand = "0.8"
		rand_chacha = "0.3"
		socketpair = "0.19"
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.25.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.26.0" }

		[features]
		full = ["ffi", "caret/full", "tor-socksproto/full", "tor-error/full", "fs-mistrust/full", "tor-config-path/full", "tor-rpc-connect/full"]