diff --git a/Cargo.lock b/Cargo.lock
index 44f0997ea..06b61538b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -269,9 +269,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "arti-client"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d225f2644ef87330b1fc55471c0a66dfb919e92d4113c9835fa2bbe840c08b"
+checksum = "20917bbfb3284158fb0d9f610b56528a8b5010f82ead92316bd4b2a42e33553d"
 dependencies = [
  "cfg-if",
  "derive_builder_fork_arti",
@@ -289,8 +289,8 @@ dependencies = [
  "serde",
  "thiserror",
  "tor-async-utils",
- "tor-basic-utils 0.7.4",
- "tor-cell 0.12.3",
+ "tor-basic-utils",
+ "tor-cell",
  "tor-chanmgr",
  "tor-checkable",
  "tor-circmgr",
@@ -623,9 +623,9 @@ dependencies = [
 
 [[package]]
 name = "asynchronous-codec"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568"
+checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233"
 dependencies = [
  "bytes 1.5.0",
  "futures-sink",
@@ -3180,6 +3180,12 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
+[[package]]
+name = "glob-match"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d"
+
 [[package]]
 name = "gloo-timers"
 version = "0.2.6"
@@ -3846,9 +3852,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
+checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
 dependencies = [
  "libc",
 ]
@@ -4596,6 +4602,16 @@ dependencies = [
  "elliptic-curve",
 ]
 
+[[package]]
+name = "priority-queue"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61"
+dependencies = [
+ "autocfg",
+ "indexmap 1.9.3",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -6448,21 +6464,6 @@ dependencies = [
  "void",
 ]
 
-[[package]]
-name = "tor-basic-utils"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d5e615a4da5d6fa4cf9b1aa91ba03af7b74c771834329aa8c3a31a24cde3e19"
-dependencies = [
- "hex",
- "libc",
- "paste",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "slab",
- "thiserror",
-]
-
 [[package]]
 name = "tor-basic-utils"
 version = "0.8.0"
@@ -6495,30 +6496,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "tor-cell"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f72aab10ca4107f4a026a67f49918c07cebd7252a4c5797bd724512d625399"
-dependencies = [
- "bitflags 2.4.1",
- "bytes 1.5.0",
- "caret",
- "derive_more",
- "educe",
- "paste",
- "rand 0.8.5",
- "thiserror",
- "tor-basic-utils 0.7.4",
- "tor-bytes",
- "tor-cert 0.7.5",
- "tor-error",
- "tor-hscrypto",
- "tor-linkspec",
- "tor-llcrypto",
- "tor-units",
-]
-
 [[package]]
 name = "tor-cell"
 version = "0.13.0"
@@ -6533,30 +6510,16 @@ dependencies = [
  "paste",
  "rand 0.8.5",
  "thiserror",
- "tor-basic-utils 0.8.0",
+ "tor-basic-utils",
  "tor-bytes",
- "tor-cert 0.8.0",
+ "tor-cert",
  "tor-error",
+ "tor-hscrypto",
  "tor-linkspec",
  "tor-llcrypto",
  "tor-units",
 ]
 
-[[package]]
-name = "tor-cert"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4134727f76a043169542812a4f6b2deaf287a240acb579758ae5add43c4a3d51"
-dependencies = [
- "caret",
- "digest 0.10.7",
- "signature 1.6.4",
- "thiserror",
- "tor-bytes",
- "tor-checkable",
- "tor-llcrypto",
-]
-
 [[package]]
 name = "tor-cert"
 version = "0.8.0"
@@ -6575,9 +6538,9 @@ dependencies = [
 
 [[package]]
 name = "tor-chanmgr"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355478f262ccda34d3679c620097bc957dda36555346974e9df5c3e3af98f499"
+checksum = "9037f813b358df2d95efd8ec3c1b9003d884958c7169e1ca7c7044b99a4775c2"
 dependencies = [
  "async-trait",
  "derive_builder_fork_arti",
@@ -6589,8 +6552,9 @@ dependencies = [
  "safelog",
  "serde",
  "thiserror",
- "tor-basic-utils 0.7.4",
- "tor-cell 0.12.3",
+ "tor-async-utils",
+ "tor-basic-utils",
+ "tor-cell",
  "tor-config",
  "tor-error",
  "tor-linkspec",
@@ -6618,9 +6582,9 @@ dependencies = [
 
 [[package]]
 name = "tor-circmgr"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa6606302270d8c27a09d20faef4b3d79ddf79f8af91af12a8d73f8ebc048b85"
+checksum = "618fb3cd1a412fa3f36a70c08adc9f4f9d207cac2e8c092d57f6e9ffafedc87a"
 dependencies = [
  "amplify",
  "async-trait",
@@ -6641,7 +6605,8 @@ dependencies = [
  "serde",
  "static_assertions",
  "thiserror",
- "tor-basic-utils 0.7.4",
+ "tor-async-utils",
+ "tor-basic-utils",
  "tor-chanmgr",
  "tor-config",
  "tor-error",
@@ -6682,7 +6647,7 @@ dependencies = [
  "strum",
  "thiserror",
  "toml 0.7.8",
- "tor-basic-utils 0.8.0",
+ "tor-basic-utils",
  "tor-error",
  "tracing",
  "void",
@@ -6702,9 +6667,9 @@ dependencies = [
 
 [[package]]
 name = "tor-dirclient"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9b2150950a18426cacabbbfcb8da12418deccceba0eb3e7b32367843699b8ed"
+checksum = "99eda450363bbffdf0d07e549d71486474c036b26a7ece2a76bbd199150b11df"
 dependencies = [
  "async-compression",
  "base64ct",
@@ -6730,9 +6695,9 @@ dependencies = [
 
 [[package]]
 name = "tor-dirmgr"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e84a50723e65fa2359a461cdd8d88e3962702ae977f8a3aba63bdd18bf7a2449"
+checksum = "cc631aedfc5361d7127c6f6a74c125e9c5a417fd1b5a6f26cd1e216af5e2c649"
 dependencies = [
  "async-trait",
  "base64ct",
@@ -6748,7 +6713,7 @@ dependencies = [
  "humantime",
  "humantime-serde",
  "itertools",
- "memmap2 0.8.0",
+ "memmap2 0.9.0",
  "once_cell",
  "paste",
  "postage",
@@ -6762,7 +6727,8 @@ dependencies = [
  "strum",
  "thiserror",
  "time 0.3.30",
- "tor-basic-utils 0.7.4",
+ "tor-async-utils",
+ "tor-basic-utils",
  "tor-checkable",
  "tor-circmgr",
  "tor-config",
@@ -6798,9 +6764,9 @@ dependencies = [
 
 [[package]]
 name = "tor-guardmgr"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645bd4e117a80a01c7ae25f8e2b89016977796a0bed5a53b1d7ccac46e9676af"
+checksum = "41ecb3b00d12b67ecf7f1f8d2238d0df04223197322706222a6e610e2b10bd2b"
 dependencies = [
  "base64ct",
  "derive_builder_fork_arti",
@@ -6820,7 +6786,8 @@ dependencies = [
  "serde",
  "strum",
  "thiserror",
- "tor-basic-utils 0.7.4",
+ "tor-async-utils",
+ "tor-basic-utils",
  "tor-config",
  "tor-error",
  "tor-linkspec",
@@ -6836,9 +6803,9 @@ dependencies = [
 
 [[package]]
 name = "tor-hsclient"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693320b3e214bd8ce52c0bb52d2b77ed6d20b3febe25e03812262e4b82d336fa"
+checksum = "764194daab7eacf5436890cc7860d3d4f604fd6dff2877efdac4916653992e4b"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -6854,9 +6821,10 @@ dependencies = [
  "slotmap",
  "strum",
  "thiserror",
- "tor-basic-utils 0.7.4",
+ "tor-async-utils",
+ "tor-basic-utils",
  "tor-bytes",
- "tor-cell 0.12.3",
+ "tor-cell",
  "tor-checkable",
  "tor-circmgr",
  "tor-config",
@@ -6891,7 +6859,7 @@ dependencies = [
  "signature 1.6.4",
  "subtle",
  "thiserror",
- "tor-basic-utils 0.8.0",
+ "tor-basic-utils",
  "tor-bytes",
  "tor-error",
  "tor-llcrypto",
@@ -6900,15 +6868,16 @@ dependencies = [
 
 [[package]]
 name = "tor-keymgr"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf6bbfa64375ea1df9cc88cfa37837b9d679fd52aa6698b9b14bd022e2ae2501"
+checksum = "d86bbc016d8f0f1c12ee95fb282c28ac027d9dc095d4e2326cdf01e4d38695c5"
 dependencies = [
  "derive_builder_fork_arti",
  "derive_more",
  "downcast-rs",
  "dyn-clone",
  "fs-mistrust",
+ "glob-match",
  "itertools",
  "rand 0.8.5",
  "serde",
@@ -6918,6 +6887,7 @@ dependencies = [
  "tor-error",
  "tor-hscrypto",
  "tor-llcrypto",
+ "walkdir",
  "zeroize",
 ]
 
@@ -6941,7 +6911,7 @@ dependencies = [
  "serde_with",
  "strum",
  "thiserror",
- "tor-basic-utils 0.8.0",
+ "tor-basic-utils",
  "tor-bytes",
  "tor-config",
  "tor-llcrypto",
@@ -7001,7 +6971,7 @@ dependencies = [
  "strum",
  "thiserror",
  "time 0.3.30",
- "tor-basic-utils 0.8.0",
+ "tor-basic-utils",
  "tor-checkable",
  "tor-config",
  "tor-error",
@@ -7043,10 +7013,10 @@ dependencies = [
  "thiserror",
  "time 0.3.30",
  "tinystr",
- "tor-basic-utils 0.8.0",
+ "tor-basic-utils",
  "tor-bytes",
- "tor-cell 0.13.0",
- "tor-cert 0.8.0",
+ "tor-cell",
+ "tor-cert",
  "tor-checkable",
  "tor-error",
  "tor-hscrypto",
@@ -7077,11 +7047,12 @@ dependencies = [
 
 [[package]]
 name = "tor-proto"
-version = "0.12.2"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef6ba8f478aa3bf0b7dd776f8938f0526399178f20dffe78596187204edaf9c5"
+checksum = "4a06c316e1fa8593cbe12664a1b15781bfd7d3817445f64cf7479ca96f969a59"
 dependencies = [
  "asynchronous-codec",
+ "bitvec",
  "bytes 1.5.0",
  "cipher 0.4.4",
  "coarsetime",
@@ -7099,10 +7070,10 @@ dependencies = [
  "subtle",
  "thiserror",
  "tor-async-utils",
- "tor-basic-utils 0.7.4",
+ "tor-basic-utils",
  "tor-bytes",
- "tor-cell 0.12.3",
- "tor-cert 0.7.5",
+ "tor-cell",
+ "tor-cert",
  "tor-checkable",
  "tor-config",
  "tor-error",
@@ -7151,22 +7122,25 @@ dependencies = [
 
 [[package]]
 name = "tor-rtmock"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cec1e390fb3329d29f6f92fbc14676f6f3fc796df52ddce73a91d3f65371c94"
+checksum = "96e00d00ba45d3d819ab3087a7ac558ad0cbb66b178fd19241c143e68da7bfbe"
 dependencies = [
  "amplify",
  "async-trait",
  "backtrace",
  "derive-adhoc",
+ "derive_more",
  "educe",
  "futures",
  "humantime",
  "itertools",
  "pin-project",
+ "priority-queue",
  "slotmap",
  "strum",
  "thiserror",
+ "tor-async-utils",
  "tor-error",
  "tor-rtcompat",
  "tracing",
diff --git a/Cargo.toml b/Cargo.toml
index aee3959b4..c4eae5be9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,7 +69,7 @@ async-rustls = {version = "0.4.1", features = ["dangerous_configuration"], optio
 
 # Pluggable Transports
 socket2 = {version = "0.5.5", features = ["all"], optional = true}
-arti-client = {version = "0.10.2", default-features = false, features = ["async-std", "error_detail", "rustls", "onion-service-client"], optional = true}
+arti-client = {version = "0.11.0", default-features = false, features = ["async-std", "error_detail", "rustls", "onion-service-client"], optional = true}
 tor-error = {version = "0.5.4", optional = true}
 tor-rtcompat = {version = "0.9.5", features = ["async-std", "rustls"], optional = true}
 tor-hscrypto = {version = "0.3.4", optional = true}