Merge branch 'arti-1.2.8-bumps' into 'main' (97642519) · Commits · yaucp / Arti

Cargo.lock

+53 −53

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

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

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

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

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

		[[package]]
		name = "arti-rpcserver"
		version = "0.22.0"
		version = "0.23.0"
		dependencies = [
		"arti-client",
		"async-trait",
		@@ -979,7 +979,7 @@ checksum = "c6d44951c469019e225e7667d799052f67fb8ea358d086878f3582b39f0de5e5"

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

		[[package]]
		name = "cc"
		@@ -1769,7 +1769,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

		[[package]]
		name = "equix"
		version = "0.1.7"
		version = "0.2.0"
		dependencies = [
		"arrayvec",
		"hashx",
		@@ -1993,7 +1993,7 @@ dependencies = [

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

		[[package]]
		name = "fslock-guard"
		version = "0.1.5"
		version = "0.2.0"
		dependencies = [
		"fslock-arti-fork",
		"test-temp-dir",
		@@ -2296,7 +2296,7 @@ dependencies = [

		[[package]]
		name = "hashx"
		version = "0.1.5"
		version = "0.2.0"
		dependencies = [
		"arrayvec",
		"blake2",
		@@ -3199,7 +3199,7 @@ dependencies = [

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

		[[package]]
		name = "retry-error"
		version = "0.5.4"
		version = "0.6.0"
		dependencies = [
		"anyhow",
		"derive_more",
		@@ -4036,7 +4036,7 @@ dependencies = [

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

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

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

		[[package]]
		name = "tor-async-utils"
		version = "0.22.0"
		version = "0.23.0"
		dependencies = [
		"educe",
		"futures",
		@@ -5023,7 +5023,7 @@ dependencies = [

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

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

		[[package]]
		name = "tor-cell"
		version = "0.22.0"
		version = "0.23.0"
		dependencies = [
		"bitflags 2.6.0",
		"bytes",
		@@ -5084,7 +5084,7 @@ dependencies = [

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

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

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

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

		[[package]]
		name = "tor-config"
		version = "0.22.0"
		version = "0.23.0"
		dependencies = [
		"amplify",
		"derive-deftly",
		@@ -5248,7 +5248,7 @@ dependencies = [

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

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

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

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

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

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

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

		[[package]]
		name = "tor-hscrypto"
		version = "0.22.0"
		version = "0.23.0"
		dependencies = [
		"cipher",
		"data-encoding",
		@@ -5519,7 +5519,7 @@ dependencies = [

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		[[package]]
		name = "tor-rtcompat"
		version = "0.22.0"
		version = "0.23.0"
		dependencies = [
		"async-io 2.3.4",
		"async-native-tls",
		@@ -6047,7 +6047,7 @@ dependencies = [

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

		[[package]]
		name = "tor-socksproto"
		version = "0.22.0"
		version = "0.23.0"
		dependencies = [
		"arbitrary",
		"caret",
		@@ -6088,7 +6088,7 @@ dependencies = [

		[[package]]
		name = "tor-units"
		version = "0.22.0"
		version = "0.23.0"
		dependencies = [
		"derive_more",
		"float-cmp",

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.2.7" }
		arti-client = { package = "arti-client", path = "../arti-client", version = "0.22.0" }
		arti = { path = "../arti", version = "1.2.8" }
		arti-client = { package = "arti-client", path = "../arti-client", version = "0.23.0" }
		clap = { version = "4.3.24", features = ["wrap_help"] }
		float-ord = "0.3"
		fs-mistrust = { path = "../fs-mistrust", version = "0.7.9" }
		fs-mistrust = { path = "../fs-mistrust", version = "0.8.0" }
		futures = "0.3.14"
		rand = "0.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.22.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.22.0", features = ["tokio", "native-tls"] }
		tor-config = { path = "../tor-config", version = "0.23.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.23.0", features = ["tokio", "native-tls"] }
		tracing = "0.1.36"
		tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

crates/arti-client/Cargo.toml

+28 −28

Original line number	Diff line number	Diff line
		[package]
		name = "arti-client"
		version = "0.22.0"
		version = "0.23.0"
		authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]
		edition = "2021"
		rust-version = "1.77"
		@@ -134,7 +134,7 @@ derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
		derive_more = { version = "1.0.0", features = ["full"] }
		dyn-clone = { version = "1.0.11", optional = true }
		educe = "0.4.6"
		fs-mistrust = { path = "../fs-mistrust", version = "0.7.9", features = ["serde"] }
		fs-mistrust = { path = "../fs-mistrust", version = "0.8.0", features = ["serde"] }
		futures = "0.3.14"
		hostname-validator = "1.1.1"
		humantime = "2"
		@@ -142,33 +142,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.3.6" }
		safelog = { path = "../safelog", version = "0.4.0" }
		serde = { version = "1.0.103", features = ["derive"] }
		thiserror = "1"
		tor-async-utils = { path = "../tor-async-utils", version = "0.22.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.22.0" }
		tor-chanmgr = { path = "../tor-chanmgr", version = "0.22.0" }
		tor-circmgr = { path = "../tor-circmgr", version = "0.22.0" }
		tor-config = { path = "../tor-config", version = "0.22.0" }
		tor-dirmgr = { path = "../tor-dirmgr", version = "0.22.0", default-features = false, features = ["mmap"] }
		tor-error = { path = "../tor-error", version = "0.22.0", features = ["tracing"] }
		tor-geoip = { path = "../tor-geoip", version = "0.22.0", optional = true }
		tor-guardmgr = { path = "../tor-guardmgr", version = "0.22.0" }
		tor-hsclient = { path = "../tor-hsclient", version = "0.22.0", optional = true }
		tor-hscrypto = { path = "../tor-hscrypto", version = "0.22.0", optional = true }
		tor-hsservice = { path = "../tor-hsservice", version = "0.22.0", optional = true }
		tor-keymgr = { path = "../tor-keymgr", version = "0.22.0", default-features = false }
		tor-linkspec = { path = "../tor-linkspec", version = "0.22.0" }
		tor-llcrypto = { path = "../tor-llcrypto", version = "0.22.0" }
		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-memquota dependency is unconditional, but most of the code is behind tor-memquota/memquota
		tor-memquota = { path = "../tor-memquota", version = "0.22.0" }
		tor-netdir = { path = "../tor-netdir", version = "0.22.0" }
		tor-netdoc = { path = "../tor-netdoc", version = "0.22.0" }
		tor-persist = { path = "../tor-persist", version = "0.22.0" }
		tor-proto = { path = "../tor-proto", version = "0.22.0" }
		tor-ptmgr = { path = "../tor-ptmgr", version = "0.22.0", optional = true }
		tor-rpcbase = { path = "../tor-rpcbase", version = "0.22.0", optional = true }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.22.0" }
		tor-memquota = { path = "../tor-memquota", version = "0.23.0" }
		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" }
		tracing = "0.1.36"
		visibility = { version = "0.1.0", optional = true }
		void = "1"
		@@ -188,8 +188,8 @@ tokio-crate = { package = "tokio", version = "1.7", features = [
		"macros",
		] }
		toml = "0.8.8"
		tor-relay-selection = { path = "../tor-relay-selection", version = "0.22.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.22.0", features = ["tokio", "native-tls"] }
		tor-relay-selection = { path = "../tor-relay-selection", version = "0.23.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.23.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.22.0"
		version = "0.23.0"
		authors = ["The Tor Project, Inc."]
		edition = "2021"
		rust-version = "1.77"
		@@ -35,20 +35,20 @@ tokio = ["tor-rtcompat/tokio", "tor-proto/tokio"]
		[dependencies]
		derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
		derive_more = { version = "1.0.0", features = ["full"] }
		fs-mistrust = { path = "../fs-mistrust", version = "0.7.9", features = ["serde"] }
		fs-mistrust = { path = "../fs-mistrust", version = "0.8.0", features = ["serde"] }
		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.22.0" }
		tor-config = { path = "../tor-config", version = "0.22.0" }
		tor-error = { path = "../tor-error", version = "0.22.0" }
		tor-keymgr = { path = "../tor-keymgr", version = "0.22.0", features = ["keymgr", "ephemeral-keystore"] }
		tor-netdir = { path = "../tor-netdir", version = "0.22.0" }
		tor-netdoc = { path = "../tor-netdoc", version = "0.22.0" }
		tor-proto = { path = "../tor-proto", version = "0.22.0" }
		tor-relay-crypto = { path = "../tor-relay-crypto", version = "0.22.0" }
		tor-rtcompat = { path = "../tor-rtcompat", version = "0.22.0" }
		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-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" }
		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.22.0"
		version = "0.23.0"
		authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]
		edition = "2021"
		rust-version = "1.77"
		@@ -18,7 +18,7 @@ crate-type = ["cdylib", "lib"]
		[dependencies]

		c_str_macro = { version = "1", optional = true }
		caret = { path = "../caret", version = "0.4.5" }
		caret = { path = "../caret", version = "0.5.0" }
		cfg-if = "1.0.0"
		derive_more = { version = "1.0.0", features = ["full"] }
		educe = "0.4.6"
		@@ -26,7 +26,7 @@ paste = { version = "1", optional = true }
		serde = { version = "1.0.103", features = ["derive"] }
		serde_json = "1.0.104"
		thiserror = "1"
		tor-socksproto = { path = "../tor-socksproto", version = "0.22.0", default-features = false, features = [
		tor-socksproto = { path = "../tor-socksproto", version = "0.23.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.22.0" }
		tor-basic-utils = { path = "../tor-basic-utils", version = "0.23.0" }

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