Merge branch 'versions' into 'main' (6f24257b) · Commits · Anu-Ra-g / Arti

Cargo.lock

+48 −48

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

		[[package]]
		name = "arti"
		version = "1.2.8"
		version = "1.3.0"
		dependencies = [
		"anyhow",
		"arti-client",
		@@ -271,7 +271,7 @@ dependencies = [

		[[package]]
		name = "arti-client"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"anyhow",
		"async-trait",
		@@ -333,7 +333,7 @@ version = "0.17.0"

		[[package]]
		name = "arti-relay"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"derive_builder_fork_arti",
		"derive_more",
		@@ -357,7 +357,7 @@ dependencies = [

		[[package]]
		name = "arti-rpc-client-core"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"caret",
		"cfg-if",
		@@ -378,7 +378,7 @@ dependencies = [

		[[package]]
		name = "arti-rpcserver"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"arti-client",
		"async-trait",
		@@ -2038,7 +2038,7 @@ dependencies = [

		[[package]]
		name = "fs-mistrust"
		version = "0.8.0"
		version = "0.8.1"
		dependencies = [
		"derive_builder_fork_arti",
		"dirs",
		@@ -4086,7 +4086,7 @@ dependencies = [

		[[package]]
		name = "safelog"
		version = "0.4.0"
		version = "0.4.1"
		dependencies = [
		"derive_more",
		"educe",
		@@ -4520,7 +4520,7 @@ dependencies = [

		[[package]]
		name = "slotmap-careful"
		version = "0.2.0"
		version = "0.2.1"
		dependencies = [
		"paste",
		"serde",
		@@ -5014,7 +5014,7 @@ dependencies = [

		[[package]]
		name = "tor-async-utils"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"derive-deftly",
		"educe",
		@@ -5033,7 +5033,7 @@ dependencies = [

		[[package]]
		name = "tor-basic-utils"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"derive_more",
		"educe",
		@@ -5053,7 +5053,7 @@ dependencies = [

		[[package]]
		name = "tor-bytes"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"bytes",
		"derive-deftly",
		@@ -5070,7 +5070,7 @@ dependencies = [

		[[package]]
		name = "tor-cell"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"bitflags 2.6.0",
		@@ -5099,7 +5099,7 @@ dependencies = [

		[[package]]
		name = "tor-cert"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"base64ct",
		"caret",
		@@ -5117,7 +5117,7 @@ dependencies = [

		[[package]]
		name = "tor-chanmgr"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"async-trait",
		"derive_builder_fork_arti",
		@@ -5154,7 +5154,7 @@ dependencies = [

		[[package]]
		name = "tor-checkable"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"humantime",
		"signature",
		@@ -5164,7 +5164,7 @@ dependencies = [

		[[package]]
		name = "tor-circmgr"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"async-trait",
		@@ -5215,7 +5215,7 @@ dependencies = [

		[[package]]
		name = "tor-config"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"cfg-if",
		@@ -5257,7 +5257,7 @@ dependencies = [

		[[package]]
		name = "tor-config-path"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"directories",
		"dirs",
		@@ -5283,7 +5283,7 @@ dependencies = [

		[[package]]
		name = "tor-consdiff"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"digest",
		"hex",
		@@ -5293,7 +5293,7 @@ dependencies = [

		[[package]]
		name = "tor-dirclient"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"async-compression",
		"base64ct",
		@@ -5321,7 +5321,7 @@ dependencies = [

		[[package]]
		name = "tor-dirmgr"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"anyhow",
		"async-trait",
		@@ -5380,7 +5380,7 @@ dependencies = [

		[[package]]
		name = "tor-error"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"anyhow",
		"derive_more",
		@@ -5411,7 +5411,7 @@ dependencies = [

		[[package]]
		name = "tor-general-addr"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"arbitrary",
		"assert_matches",
		@@ -5422,7 +5422,7 @@ dependencies = [

		[[package]]
		name = "tor-geoip"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"derive_more",
		"once_cell",
		@@ -5432,7 +5432,7 @@ dependencies = [

		[[package]]
		name = "tor-guardmgr"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"base64ct",
		@@ -5479,7 +5479,7 @@ dependencies = [

		[[package]]
		name = "tor-hsclient"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"async-trait",
		"derive-deftly",
		@@ -5526,7 +5526,7 @@ dependencies = [

		[[package]]
		name = "tor-hscrypto"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"arrayvec",
		"blake2",
		@@ -5558,7 +5558,7 @@ dependencies = [

		[[package]]
		name = "tor-hsrproxy"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"derive-deftly",
		"derive_builder_fork_arti",
		@@ -5585,7 +5585,7 @@ dependencies = [

		[[package]]
		name = "tor-hsservice"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"async-trait",
		@@ -5650,7 +5650,7 @@ dependencies = [

		[[package]]
		name = "tor-key-forge"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"derive-deftly",
		"derive_more",
		@@ -5668,7 +5668,7 @@ dependencies = [

		[[package]]
		name = "tor-keymgr"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"arrayvec",
		@@ -5705,7 +5705,7 @@ dependencies = [

		[[package]]
		name = "tor-linkspec"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"base64ct",
		"by_address",
		@@ -5732,7 +5732,7 @@ dependencies = [

		[[package]]
		name = "tor-llcrypto"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"aes",
		"base64ct",
		@@ -5771,7 +5771,7 @@ dependencies = [

		[[package]]
		name = "tor-log-ratelim"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"futures",
		"humantime",
		@@ -5785,7 +5785,7 @@ dependencies = [

		[[package]]
		name = "tor-memquota"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"derive-deftly",
		"derive_more",
		@@ -5817,7 +5817,7 @@ dependencies = [

		[[package]]
		name = "tor-netdir"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"bitflags 2.6.0",
		"derive_more",
		@@ -5852,7 +5852,7 @@ dependencies = [

		[[package]]
		name = "tor-netdoc"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"anyhow",
		@@ -5899,7 +5899,7 @@ dependencies = [

		[[package]]
		name = "tor-persist"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"anyhow",
		@@ -5929,7 +5929,7 @@ dependencies = [

		[[package]]
		name = "tor-proto"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"asynchronous-codec",
		"bitvec",
		@@ -5984,7 +5984,7 @@ dependencies = [

		[[package]]
		name = "tor-protover"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"caret",
		"thiserror",
		@@ -5992,7 +5992,7 @@ dependencies = [

		[[package]]
		name = "tor-ptmgr"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"anyhow",
		"async-trait",
		@@ -6020,7 +6020,7 @@ dependencies = [

		[[package]]
		name = "tor-relay-crypto"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"derive-deftly",
		"derive_more",
		@@ -6031,7 +6031,7 @@ dependencies = [

		[[package]]
		name = "tor-relay-selection"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"once_cell",
		"rand",
		@@ -6045,7 +6045,7 @@ dependencies = [

		[[package]]
		name = "tor-rpcbase"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"assert-impl",
		"derive-deftly",
		@@ -6069,7 +6069,7 @@ dependencies = [

		[[package]]
		name = "tor-rtcompat"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"arbitrary",
		"assert_matches",
		@@ -6100,7 +6100,7 @@ dependencies = [

		[[package]]
		name = "tor-rtmock"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"async-trait",
		@@ -6129,7 +6129,7 @@ dependencies = [

		[[package]]
		name = "tor-socksproto"
		version = "0.23.0"
		version = "0.24.0"
		dependencies = [
		"amplify",
		"anyhow",
		@@ -6147,7 +6147,7 @@ dependencies = [

		[[package]]
		name = "tor-units"
		version = "0.23.0"
		version = "0.24.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.2.8" }
		arti-client = { package = "arti-client", path = "../arti-client", version = "0.23.0" }
		arti = { path = "../arti", version = "1.3.0" }
		arti-client = { package = "arti-client", path = "../arti-client", version = "0.24.0" }
		clap = { version = "4.3.24", features = ["wrap_help"] }
		float-ord = "0.3"
		fs-mistrust = { path = "../fs-mistrust", version = "0.8.0" }
		@@ -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.23.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.23.0", features = ["tokio", "native-tls"] }
		tor-config = { path = "../tor-config", version = "0.24.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.24.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.23.0"
		version = "0.24.0"
		authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]
		edition = "2021"
		rust-version = "1.77"
		@@ -152,33 +152,33 @@ humantime-serde = "1.1.1"
		libc = "0.2"
		postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
		rand = "0.8"
		safelog = { path = "../safelog", version = "0.4.0" }
		safelog = { path = "../safelog", version = "0.4.1" }
		serde = { version = "1.0.103", features = ["derive"] }
		thiserror = "1"
		tor-async-utils = { path = "../tor-async-utils", version = "0.23.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.23.0" }
		tor-chanmgr = { path = "../tor-chanmgr", version = "0.23.0" }
		tor-circmgr = { path = "../tor-circmgr", version = "0.23.0" }
		tor-config = { path = "../tor-config", version = "0.23.0" }
		tor-dirmgr = { path = "../tor-dirmgr", version = "0.23.0", default-features = false, features = ["mmap"] }
		tor-error = { path = "../tor-error", version = "0.23.0", features = ["tracing"] }
		tor-geoip = { path = "../tor-geoip", version = "0.23.0", optional = true }
		tor-guardmgr = { path = "../tor-guardmgr", version = "0.23.0" }
		tor-hsclient = { path = "../tor-hsclient", version = "0.23.0", optional = true }
		tor-hscrypto = { path = "../tor-hscrypto", version = "0.23.0", optional = true }
		tor-hsservice = { path = "../tor-hsservice", version = "0.23.0", optional = true }
		tor-keymgr = { path = "../tor-keymgr", version = "0.23.0", default-features = false }
		tor-linkspec = { path = "../tor-linkspec", version = "0.23.0" }
		tor-llcrypto = { path = "../tor-llcrypto", version = "0.23.0" }
		tor-async-utils = { path = "../tor-async-utils", version = "0.24.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.24.0" }
		tor-chanmgr = { path = "../tor-chanmgr", version = "0.24.0" }
		tor-circmgr = { path = "../tor-circmgr", version = "0.24.0" }
		tor-config = { path = "../tor-config", version = "0.24.0" }
		tor-dirmgr = { path = "../tor-dirmgr", version = "0.24.0", default-features = false, features = ["mmap"] }
		tor-error = { path = "../tor-error", version = "0.24.0", features = ["tracing"] }
		tor-geoip = { path = "../tor-geoip", version = "0.24.0", optional = true }
		tor-guardmgr = { path = "../tor-guardmgr", version = "0.24.0" }
		tor-hsclient = { path = "../tor-hsclient", version = "0.24.0", optional = true }
		tor-hscrypto = { path = "../tor-hscrypto", version = "0.24.0", optional = true }
		tor-hsservice = { path = "../tor-hsservice", version = "0.24.0", optional = true }
		tor-keymgr = { path = "../tor-keymgr", version = "0.24.0", default-features = false }
		tor-linkspec = { path = "../tor-linkspec", version = "0.24.0" }
		tor-llcrypto = { path = "../tor-llcrypto", version = "0.24.0" }
		# tor-memquota dependency is unconditional, but most of the code is behind tor-memquota/memquota
		tor-memquota = { path = "../tor-memquota", version = "0.23.0", default-features = false }
		tor-netdir = { path = "../tor-netdir", version = "0.23.0" }
		tor-netdoc = { path = "../tor-netdoc", version = "0.23.0" }
		tor-persist = { path = "../tor-persist", version = "0.23.0" }
		tor-proto = { path = "../tor-proto", version = "0.23.0" }
		tor-ptmgr = { path = "../tor-ptmgr", version = "0.23.0", optional = true }
		tor-rpcbase = { path = "../tor-rpcbase", version = "0.23.0", optional = true }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.23.0" }
		tor-memquota = { path = "../tor-memquota", version = "0.24.0", default-features = false }
		tor-netdir = { path = "../tor-netdir", version = "0.24.0" }
		tor-netdoc = { path = "../tor-netdoc", version = "0.24.0" }
		tor-persist = { path = "../tor-persist", version = "0.24.0" }
		tor-proto = { path = "../tor-proto", version = "0.24.0" }
		tor-ptmgr = { path = "../tor-ptmgr", version = "0.24.0", optional = true }
		tor-rpcbase = { path = "../tor-rpcbase", version = "0.24.0", optional = true }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.24.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.23.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.23.0", features = ["tokio", "native-tls"] }
		tor-relay-selection = { path = "../tor-relay-selection", version = "0.24.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.24.0", features = ["tokio", "native-tls"] }
		tracing-subscriber = "0.3.0"

		[package.metadata.docs.rs]

crates/arti-relay/Cargo.toml

+11 −11

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

		[dev-dependencies]

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

+4 −4

Original line number	Diff line number	Diff line
		[package]
		name = "arti-rpc-client-core"
		version = "0.23.0"
		version = "0.24.0"
		authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]
		edition = "2021"
		rust-version = "1.77"
		@@ -25,8 +25,8 @@ paste = { version = "1", optional = true }
		serde = { version = "1.0.103", features = ["derive"] }
		serde_json = "1.0.104"
		thiserror = "1"
		tor-error = { version = "0.23.0", path = "../tor-error", default-features = false }
		tor-socksproto = { path = "../tor-socksproto", version = "0.23.0", default-features = false, features = [
		tor-error = { version = "0.24.0", path = "../tor-error", default-features = false }
		tor-socksproto = { path = "../tor-socksproto", version = "0.24.0", default-features = false, features = [
		"client-handshake",
		] }
		void = "1"
		@@ -35,7 +35,7 @@ void = "1"
		rand = "0.8"
		rand_chacha = "0.3"
		socketpair = "0.19"
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.23.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.24.0" }

		[features]
		full = ["ffi", "caret/full", "tor-socksproto/full", "tor-error/full"]