Merge branch 'versions' into 'main' (f7aeca74) · Commits · The Tor Project / Core / Arti

Cargo.lock

+43 −43

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"

		[[package]]
		name = "arti"
		version = "1.2.1"
		version = "1.2.2"
		dependencies = [
		"anyhow",
		"arti-client",
		@@ -268,7 +268,7 @@ dependencies = [

		[[package]]
		name = "arti-client"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"anyhow",
		"cfg-if",
		@@ -323,7 +323,7 @@ version = "0.17.0"

		[[package]]
		name = "arti-hyper"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"anyhow",
		"arti-client",
		@@ -342,7 +342,7 @@ dependencies = [

		[[package]]
		name = "arti-rpcserver"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"arti-client",
		"asynchronous-codec",
		@@ -1636,7 +1636,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

		[[package]]
		name = "equix"
		version = "0.1.3"
		version = "0.1.4"
		dependencies = [
		"arrayvec",
		"hashx",
		@@ -1891,7 +1891,7 @@ dependencies = [

		[[package]]
		name = "fs-mistrust"
		version = "0.7.9"
		version = "0.7.10"
		dependencies = [
		"derive_builder_fork_arti",
		"dirs",
		@@ -2198,7 +2198,7 @@ dependencies = [

		[[package]]
		name = "hashx"
		version = "0.1.3"
		version = "0.1.4"
		dependencies = [
		"arrayvec",
		"blake2",
		@@ -4915,7 +4915,7 @@ dependencies = [

		[[package]]
		name = "tor-async-utils"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"futures",
		"futures-await-test",
		@@ -4927,7 +4927,7 @@ dependencies = [

		[[package]]
		name = "tor-basic-utils"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"derive_more",
		"educe",
		@@ -4943,7 +4943,7 @@ dependencies = [

		[[package]]
		name = "tor-bytes"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"bytes",
		"digest",
		@@ -4958,7 +4958,7 @@ dependencies = [

		[[package]]
		name = "tor-cell"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"bitflags 2.5.0",
		"bytes",
		@@ -4983,7 +4983,7 @@ dependencies = [

		[[package]]
		name = "tor-cert"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"base64ct",
		"caret",
		@@ -5001,7 +5001,7 @@ dependencies = [

		[[package]]
		name = "tor-chanmgr"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"async-trait",
		"derive_builder_fork_arti",
		@@ -5036,7 +5036,7 @@ dependencies = [

		[[package]]
		name = "tor-checkable"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"humantime 2.1.0",
		"signature",
		@@ -5046,7 +5046,7 @@ dependencies = [

		[[package]]
		name = "tor-circmgr"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"amplify",
		"async-trait",
		@@ -5094,7 +5094,7 @@ dependencies = [

		[[package]]
		name = "tor-config"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"derive-deftly",
		"derive_builder_fork_arti",
		@@ -5137,7 +5137,7 @@ dependencies = [

		[[package]]
		name = "tor-consdiff"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"digest",
		"hex",
		@@ -5147,7 +5147,7 @@ dependencies = [

		[[package]]
		name = "tor-dirclient"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"async-compression",
		"base64ct",
		@@ -5175,7 +5175,7 @@ dependencies = [

		[[package]]
		name = "tor-dirmgr"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"anyhow",
		"async-trait",
		@@ -5232,7 +5232,7 @@ dependencies = [

		[[package]]
		name = "tor-error"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"anyhow",
		"backtrace",
		@@ -5263,7 +5263,7 @@ dependencies = [

		[[package]]
		name = "tor-geoip"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"derive_more",
		"once_cell",
		@@ -5273,7 +5273,7 @@ dependencies = [

		[[package]]
		name = "tor-guardmgr"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"amplify",
		"base64ct",
		@@ -5317,7 +5317,7 @@ dependencies = [

		[[package]]
		name = "tor-hsclient"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"async-trait",
		"derive-deftly",
		@@ -5362,7 +5362,7 @@ dependencies = [

		[[package]]
		name = "tor-hscrypto"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"cipher",
		"data-encoding",
		@@ -5402,7 +5402,7 @@ dependencies = [

		[[package]]
		name = "tor-hsrproxy"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"derive-deftly",
		"derive_builder_fork_arti",
		@@ -5428,7 +5428,7 @@ dependencies = [

		[[package]]
		name = "tor-hsservice"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"async-trait",
		"base64ct",
		@@ -5489,7 +5489,7 @@ dependencies = [

		[[package]]
		name = "tor-keymgr"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"amplify",
		"arrayvec",
		@@ -5521,7 +5521,7 @@ dependencies = [

		[[package]]
		name = "tor-linkspec"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"base64ct",
		"by_address",
		@@ -5547,7 +5547,7 @@ dependencies = [

		[[package]]
		name = "tor-llcrypto"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"aes",
		"base64ct",
		@@ -5583,7 +5583,7 @@ dependencies = [

		[[package]]
		name = "tor-log-ratelim"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"futures",
		"humantime 2.1.0",
		@@ -5597,7 +5597,7 @@ dependencies = [

		[[package]]
		name = "tor-memquota"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"derive-deftly",
		"derive_builder_fork_arti",
		@@ -5623,7 +5623,7 @@ dependencies = [

		[[package]]
		name = "tor-netdir"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"bitflags 2.5.0",
		"derive_more",
		@@ -5658,7 +5658,7 @@ dependencies = [

		[[package]]
		name = "tor-netdoc"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"amplify",
		"anyhow",
		@@ -5704,7 +5704,7 @@ dependencies = [

		[[package]]
		name = "tor-persist"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"amplify",
		"anyhow",
		@@ -5730,7 +5730,7 @@ dependencies = [

		[[package]]
		name = "tor-proto"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"asynchronous-codec",
		"bitvec",
		@@ -5782,7 +5782,7 @@ dependencies = [

		[[package]]
		name = "tor-protover"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"caret",
		"thiserror",
		@@ -5790,7 +5790,7 @@ dependencies = [

		[[package]]
		name = "tor-ptmgr"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"anyhow",
		"async-trait",
		@@ -5816,7 +5816,7 @@ dependencies = [

		[[package]]
		name = "tor-relay-selection"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"once_cell",
		"rand",
		@@ -5830,7 +5830,7 @@ dependencies = [

		[[package]]
		name = "tor-rpcbase"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"assert-impl",
		"derive-deftly",
		@@ -5852,7 +5852,7 @@ dependencies = [

		[[package]]
		name = "tor-rtcompat"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"async-io 2.3.2",
		"async-native-tls",
		@@ -5877,7 +5877,7 @@ dependencies = [

		[[package]]
		name = "tor-rtmock"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"amplify",
		"async-trait",
		@@ -5906,7 +5906,7 @@ dependencies = [

		[[package]]
		name = "tor-socksproto"
		version = "0.17.0"
		version = "0.18.0"
		dependencies = [
		"arbitrary",
		"caret",
		@@ -5919,7 +5919,7 @@ dependencies = [

		[[package]]
		name = "tor-units"
		version = "0.17.0"
		version = "0.18.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.1" }
		arti-client = { package = "arti-client", path = "../arti-client", version = "0.17.0" }
		arti = { path = "../arti", version = "1.2.2" }
		arti-client = { package = "arti-client", path = "../arti-client", version = "0.18.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.17.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.17.0", features = ["tokio", "native-tls"] }
		tor-config = { path = "../tor-config", version = "0.18.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.18.0", features = ["tokio", "native-tls"] }
		tracing = "0.1.36"
		tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

crates/arti-client/Cargo.toml

+24 −24

Original line number	Diff line number	Diff line
		[package]
		name = "arti-client"
		version = "0.17.0"
		version = "0.18.0"
		authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]
		edition = "2021"
		rust-version = "1.70"
		@@ -125,28 +125,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.17.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.17.0" }
		tor-chanmgr = { path = "../tor-chanmgr", version = "0.17.0" }
		tor-circmgr = { path = "../tor-circmgr", version = "0.17.0" }
		tor-config = { path = "../tor-config", version = "0.17.0" }
		tor-dirmgr = { path = "../tor-dirmgr", version = "0.17.0", default-features = false, features = ["mmap"] }
		tor-error = { path = "../tor-error", version = "0.17.0", features = ["tracing"] }
		tor-geoip = { path = "../tor-geoip", version = "0.17.0", optional = true }
		tor-guardmgr = { path = "../tor-guardmgr", version = "0.17.0" }
		tor-hsclient = { path = "../tor-hsclient", version = "0.17.0", optional = true }
		tor-hscrypto = { path = "../tor-hscrypto", version = "0.17.0", optional = true }
		tor-hsservice = { path = "../tor-hsservice", version = "0.17.0", optional = true }
		tor-keymgr = { path = "../tor-keymgr", version = "0.17.0", default-features = false }
		tor-linkspec = { path = "../tor-linkspec", version = "0.17.0" }
		tor-llcrypto = { path = "../tor-llcrypto", version = "0.17.0" }
		tor-netdir = { path = "../tor-netdir", version = "0.17.0" }
		tor-netdoc = { path = "../tor-netdoc", version = "0.17.0" }
		tor-persist = { path = "../tor-persist", version = "0.17.0" }
		tor-proto = { path = "../tor-proto", version = "0.17.0" }
		tor-ptmgr = { path = "../tor-ptmgr", version = "0.17.0", optional = true }
		tor-rpcbase = { path = "../tor-rpcbase", version = "0.17.0", optional = true }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.17.0" }
		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" }
		tracing = "0.1.36"
		void = "1"

		@@ -164,7 +164,7 @@ tokio-crate = { package = "tokio", version = "1.7", features = [
		"macros",
		] }
		toml = "0.8.8"
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.17.0", features = ["tokio", "native-tls"] }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.18.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.17.0"
		version = "0.18.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.17.0" }
		arti-client = { path = "../arti-client", version = "0.18.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.17.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.17.0", features = ["tokio"] }
		tor-error = { path = "../tor-error", version = "0.18.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.18.0", features = ["tokio"] }

		[target.'cfg(target_vendor="apple")'.dev-dependencies]
		tls-api-openssl = "0.9.0"

crates/arti-rpcserver/Cargo.toml

+9 −9

Original line number	Diff line number	Diff line
		[package]
		name = "arti-rpcserver"
		version = "0.17.0"
		version = "0.18.0"
		edition = "2021"
		rust-version = "1.70"
		authors = ["The Tor Project, Inc.", "eta <eta@torproject.org>"]
		@@ -24,7 +24,7 @@ full = [
		]

		[dependencies]
		arti-client = { path = "../arti-client", version = "0.17.0", features = ["rpc"] }
		arti-client = { path = "../arti-client", version = "0.18.0", features = ["rpc"] }
		asynchronous-codec = { version = "0.7.0", features = ["json"] }
		base64ct = "1.5.1"
		bytes = "1"
		@@ -39,12 +39,12 @@ 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.17.0" }
		tor-bytes = { path = "../tor-bytes", version = "0.17.0" }
		tor-error = { path = "../tor-error", version = "0.17.0" }
		tor-llcrypto = { path = "../tor-llcrypto", version = "0.17.0" }
		tor-rpcbase = { path = "../tor-rpcbase", version = "0.17.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.17.0" }
		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-rpcbase = { path = "../tor-rpcbase", version = "0.18.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.18.0" }
		tracing = "0.1.36"
		typetag = "0.2.7"
		weak-table = "0.3.0"
		@@ -52,4 +52,4 @@ zeroize = "1"

		[dev-dependencies]
		futures-await-test = "0.3.0"
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.17.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.18.0" }