diff --git a/Cargo.lock b/Cargo.lock
index 2d3c901c..24f0631a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -449,9 +449,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "arti-client"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ef6ce4ca6686d6a8561872d01791f0b9f23ea4455a7f1340850d0fac049817"
+checksum = "9600759b9461ddc620a657ddb0c60ad30ba2774c35063d65c8463c292c20bca4"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.0",
@@ -471,6 +471,7 @@ dependencies = [
  "safelog",
  "serde",
  "thiserror 2.0.12",
+ "time",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-chanmgr",
@@ -491,6 +492,7 @@ dependencies = [
  "tor-netdoc",
  "tor-persist",
  "tor-proto",
+ "tor-protover",
  "tor-ptmgr",
  "tor-rtcompat",
  "tracing",
@@ -9292,9 +9294,9 @@ checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
 
 [[package]]
 name = "tor-async-utils"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8af0bcb05f22eea7c8d4015082019963c592e300de1c692af6c3c418c080eb0"
+checksum = "ae472e9363f0a6996f7fd52f795b942c895d807e63799b5c5712524d832b4ac4"
 dependencies = [
  "derive-deftly 1.0.1",
  "educe",
@@ -9308,9 +9310,9 @@ dependencies = [
 
 [[package]]
 name = "tor-basic-utils"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "182be53685e694cf90ce7e696e116cc0b01434522f17f12ce374b51f7a40bfc9"
+checksum = "e34a3106b61f70d1e92072859ea63bbcd1abea928bb2518314b1ead229c876b3"
 dependencies = [
  "derive_more",
  "hex",
@@ -9327,9 +9329,9 @@ dependencies = [
 
 [[package]]
 name = "tor-bytes"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea40884e6a999280e985e758a230366c9e976da70df899574751151631b4c864"
+checksum = "679fd4574ccd514cecec56593c262703c9ff550addf0b68a857629d8878e721c"
 dependencies = [
  "bytes 1.10.1",
  "derive-deftly 1.0.1",
@@ -9345,9 +9347,9 @@ dependencies = [
 
 [[package]]
 name = "tor-cell"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcda4d1dcfdd9a8954a3ff569f3ab3217bb3686c90d3acf5fb3f9576cae47431"
+checksum = "4e70fd32db0340b839bd7eefd7692e7ebf5213951e6fb5d55584226d6a1d1230"
 dependencies = [
  "amplify",
  "bitflags 2.9.1",
@@ -9374,9 +9376,9 @@ dependencies = [
 
 [[package]]
 name = "tor-cert"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7042c22afc733f256947042bcaaffc28c6ec51d53cb6ecef6d5b1ad6fd3989bd"
+checksum = "919f2405bc098fb37f2fee6dfaf90e9a39e7fbe353ff5b209464bb7cb7be107e"
 dependencies = [
  "caret",
  "derive_builder_fork_arti",
@@ -9390,9 +9392,9 @@ dependencies = [
 
 [[package]]
 name = "tor-chanmgr"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf904041fcecc51eb6b4d2b18f6b7265b474b7fe8a3a6f5e9189daa357dbb7b0"
+checksum = "d72cf71c97fbb8ab50ee3453f4c6cfac9e6cec66d3e0f4b392b1065ad47142ea"
 dependencies = [
  "async-trait",
  "caret",
@@ -9425,9 +9427,9 @@ dependencies = [
 
 [[package]]
 name = "tor-checkable"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3f44a30f1c7c924bfdc9e358ed197ed3bd0a6fa9b7a3271d6dc367a5e08f3fd"
+checksum = "00a4328f9a14ab9b3b21ae84d96c6fa0b45731f071bebe0a5bba7d66753b8654"
 dependencies = [
  "humantime",
  "signature 2.2.0",
@@ -9437,9 +9439,9 @@ dependencies = [
 
 [[package]]
 name = "tor-circmgr"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36a9a7d2c457482ce17ba086c623ddc7109fb9f2143170d65cbefc0ee3474ef"
+checksum = "1086a2d9bf0182b61a26eaef5a44d5e201df0716faac6450cd0aafe97876ef63"
 dependencies = [
  "amplify",
  "async-trait",
@@ -9485,9 +9487,9 @@ dependencies = [
 
 [[package]]
 name = "tor-config"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c04314fef18dd6ea027c4dbe64e34bd9b5f2c900fa6b8fe331b68ced55591d"
+checksum = "f4a0099cd04bbe4f15c7a7ff2cbe296e8483080fdc9f29445d046e43ad43238d"
 dependencies = [
  "amplify",
  "cfg-if 1.0.0",
@@ -9519,9 +9521,9 @@ dependencies = [
 
 [[package]]
 name = "tor-config-path"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6162c71d9cdab7a8cd249be2c0c922f6a4ac926fc32d03b320696f426260d9cc"
+checksum = "96df671c199202597bf631156f922ed4c7fc5e9d964fb4df4fcf9d7dc2b9e6b1"
 dependencies = [
  "directories",
  "once_cell",
@@ -9534,9 +9536,9 @@ dependencies = [
 
 [[package]]
 name = "tor-consdiff"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a0b9697be65ba2e9dae30f536e5dff4d3489d30ea1f5df862afacb91dfdca9"
+checksum = "2dcb72a74052dccc2e7d4db82ffb079c5b2de66619767475d99939c440ea0771"
 dependencies = [
  "digest 0.10.7",
  "hex",
@@ -9546,9 +9548,9 @@ dependencies = [
 
 [[package]]
 name = "tor-dirclient"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4416c5031e75625b620c2a56e1051993076b3e8574f79ec0251e2b736da2f1e"
+checksum = "cb4cc3ccae0106893784a50291c9f2bc9a60478dc77dec97606962066de51add"
 dependencies = [
  "async-compression",
  "base64ct",
@@ -9574,9 +9576,9 @@ dependencies = [
 
 [[package]]
 name = "tor-dirmgr"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97978e4080932866d8a8cae042fd20a72f3fa91095834dced74bd4f6ceaa4180"
+checksum = "0f4047aa930f52dc037d12cf12a757817ee7fed2d55ac39733bd84039f7018c7"
 dependencies = [
  "async-trait",
  "base64ct",
@@ -9602,6 +9604,7 @@ dependencies = [
  "safelog",
  "scopeguard",
  "serde",
+ "serde_json",
  "signature 2.2.0",
  "static_assertions",
  "strum 0.27.1",
@@ -9621,15 +9624,16 @@ dependencies = [
  "tor-netdoc",
  "tor-persist",
  "tor-proto",
+ "tor-protover",
  "tor-rtcompat",
  "tracing",
 ]
 
 [[package]]
 name = "tor-error"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6488b3bf0c82b1880505ea060bfa8dc24d380e16efe354e3449a283f4212b73"
+checksum = "fcb86e4066361d17a99c3ff499473814fed182fca25cb8c53e350f23f6f6fe86"
 dependencies = [
  "derive_more",
  "futures 0.3.31",
@@ -9645,9 +9649,9 @@ dependencies = [
 
 [[package]]
 name = "tor-general-addr"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7551ba9b4449958e5f072d85501e9f2c32ae8002f438c5383465c2369e642813"
+checksum = "dc30ae918d31b5463a21ee5a2970e3670795276fbd1c565aa0c6170c0b3dcb3f"
 dependencies = [
  "derive_more",
  "thiserror 2.0.12",
@@ -9656,9 +9660,9 @@ dependencies = [
 
 [[package]]
 name = "tor-guardmgr"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d0877a98542eaa2b9f669336c9132fe35cb8ee530af94ad50bce407af23088"
+checksum = "f11db35299ec505a09a6e52c1f6da10450e25f9966043980a04b6cdbbc9aec5f"
 dependencies = [
  "amplify",
  "base64ct",
@@ -9699,9 +9703,9 @@ dependencies = [
 
 [[package]]
 name = "tor-hsclient"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6fc936ee17c88f83bab968c21e6f631904fc441cd01e1d0b219b12668134dbe"
+checksum = "a5c5969746e551b55a770bee1614c5a5f6f5e31b24222530a32eef8705d65ec6"
 dependencies = [
  "async-trait",
  "derive-deftly 1.0.1",
@@ -9736,15 +9740,16 @@ dependencies = [
  "tor-netdoc",
  "tor-persist",
  "tor-proto",
+ "tor-protover",
  "tor-rtcompat",
  "tracing",
 ]
 
 [[package]]
 name = "tor-hscrypto"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e2ddacd739dd691bb3623e045ef07d8660d157f5a882e9b996b79f5e3803fa0"
+checksum = "6c9a27cb49e849891e582aaa50e8a0ea69313c07459602b9b329b261e63dc59a"
 dependencies = [
  "cipher 0.4.4",
  "data-encoding",
@@ -9772,18 +9777,20 @@ dependencies = [
 
 [[package]]
 name = "tor-hsrproxy"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2ea44027924b8868fc7de05389766257d90bc04eb1f2652b32d62280c20ed5"
+checksum = "21aaedc9431d390714b2691f11c16c71f506ddbbeddeb5c658befc5e3f018eaf"
 dependencies = [
  "derive-deftly 1.0.1",
  "derive_builder_fork_arti",
  "futures 0.3.31",
+ "itertools 0.14.0",
  "oneshot-fused-workaround",
  "rangemap",
  "safelog",
  "serde",
  "serde_with",
+ "strum 0.27.1",
  "thiserror 2.0.12",
  "tor-async-utils",
  "tor-cell",
@@ -9799,9 +9806,9 @@ dependencies = [
 
 [[package]]
 name = "tor-hsservice"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e6609424df5d0830d0182ee4f77df5f8246767b0433993e2d7a0816914ac48"
+checksum = "9c82ef7ea3069c675e6ef0edce1e4f333a575d753e763d04f1d481c944d7a679"
 dependencies = [
  "amplify",
  "async-trait",
@@ -9857,9 +9864,9 @@ dependencies = [
 
 [[package]]
 name = "tor-key-forge"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac47ab4aff8c0af8cf92b5dd3984e830c4da564bb48f06630aa7f951c688f0ba"
+checksum = "48b1c658d4f88ca59bc3b384ca3de908eebe5000c243283b2e458adf932a1d2d"
 dependencies = [
  "derive-deftly 1.0.1",
  "derive_more",
@@ -9878,9 +9885,9 @@ dependencies = [
 
 [[package]]
 name = "tor-keymgr"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a0bc40b735b3d1e04d8ac550bce66d40ea84ef5fc47a76fc8f64713b4abe3f"
+checksum = "8bcb6b882b635aba303dc718330bcfc6287d3756b5e7c1870259f92ac795432c"
 dependencies = [
  "amplify",
  "arrayvec 0.7.6",
@@ -9916,9 +9923,9 @@ dependencies = [
 
 [[package]]
 name = "tor-linkspec"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12f5be8e6077b66ec04e64b7e1a779e77af44893b5454cd0928289c45767780"
+checksum = "c24b7652c8130efc619e4ffe24886b169e5b3664a3756a869d1e69206ce67a39"
 dependencies = [
  "base64ct",
  "by_address",
@@ -9943,9 +9950,9 @@ dependencies = [
 
 [[package]]
 name = "tor-llcrypto"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057afeb075f0689c40465646a1b7671baffebd3c8dd40e62ed5013a5ab157e76"
+checksum = "85f10a68746bbf0fad32abcd38f1a9fa905c9e60c92a99cae35e96ee617075a3"
 dependencies = [
  "aes",
  "base64ct",
@@ -9983,9 +9990,9 @@ dependencies = [
 
 [[package]]
 name = "tor-log-ratelim"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b4f7d6adb39d73c414e891b37abd380a1e1eb1545735da422581128b1a9274"
+checksum = "6fe3c68920a78eeb81eef3fe50fcffa3f65e4f2394c2132e8849b6ac6d244413"
 dependencies = [
  "futures 0.3.31",
  "humantime",
@@ -9999,9 +10006,9 @@ dependencies = [
 
 [[package]]
 name = "tor-memquota"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c86c061032e8d1b2922016fbe40b48a967dc7a3c09cd5bb0e3a33a00dad210ef"
+checksum = "c2e0391e1c8377c1511a11707aef7e850427fe3448de8e8794b016e9216d5b4c"
 dependencies = [
  "derive-deftly 1.0.1",
  "derive_more",
@@ -10027,9 +10034,9 @@ dependencies = [
 
 [[package]]
 name = "tor-netdir"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a7a1ff78d5bc186836ffe50012dfdd7e9a137a692201d5e8dd204df2c1f608"
+checksum = "79e0e2fd36ffa1f815ee68ada149e89dde17472e10c8ad2ea27798f32916e020"
 dependencies = [
  "async-trait",
  "bitflags 2.9.1",
@@ -10060,9 +10067,9 @@ dependencies = [
 
 [[package]]
 name = "tor-netdoc"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bafcb9dc0ac3ef8ab6e2006ab892699797cb8381e18a0248e138027a6817c8b"
+checksum = "5f85d89993af320afe9139850939a7450884610e66908dfe17bc2b427902296b"
 dependencies = [
  "amplify",
  "base64ct",
@@ -10105,9 +10112,9 @@ dependencies = [
 
 [[package]]
 name = "tor-persist"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a245023c2109228264d03ef7c1c549e41052b9a2a8b193acb8f98d82ad5982bf"
+checksum = "0c4880170f467e6b44547e258880cd3dcdbeff643881e7aefc7155a59ef30615"
 dependencies = [
  "amplify",
  "derive-deftly 1.0.1",
@@ -10134,15 +10141,16 @@ dependencies = [
 
 [[package]]
 name = "tor-proto"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea421e41f1e2cc5ac8b990610d0a69a330532a863b344c44812a815af25811a"
+checksum = "4548ddde59a82813db633b9599fc251516ac61c951f3e27e4ec86b0dacb9b56b"
 dependencies = [
  "amplify",
  "asynchronous-codec",
  "bitvec",
  "bytes 1.10.1",
  "caret",
+ "cfg-if 1.0.0",
  "cipher 0.4.4",
  "coarsetime",
  "derive-deftly 1.0.1",
@@ -10178,6 +10186,7 @@ dependencies = [
  "tor-llcrypto",
  "tor-log-ratelim",
  "tor-memquota",
+ "tor-protover",
  "tor-rtcompat",
  "tor-rtmock",
  "tor-units",
@@ -10190,20 +10199,21 @@ dependencies = [
 
 [[package]]
 name = "tor-protover"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a887114e6ed2f2e2b291c16cfcf751e26298fb2be4599b0a44cae47a588dc4ae"
+checksum = "b6ca1c73814a234e2d39f3aa168d867999c82ced075bef5a96c31648fa0aab36"
 dependencies = [
  "caret",
  "paste",
+ "serde_with",
  "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "tor-ptmgr"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97076372ccf3aea12652b839c913c6762c208809f7f28bcca353eef88fb398c6"
+checksum = "e07dd68f072c9f9cf61d1f8c88ab21243115fcf983d50fd04448c126a55b71be"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.0",
@@ -10228,9 +10238,9 @@ dependencies = [
 
 [[package]]
 name = "tor-relay-selection"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba0d8a53a12c0fbdb1b842f0705629bacf11ab2c99531a58952c53fa619f830f"
+checksum = "9db156435a2859b71ec17ef4ca04b0cfc6ecd6a68e401375d79f155baed99ad2"
 dependencies = [
  "rand 0.9.1",
  "serde",
@@ -10242,9 +10252,9 @@ dependencies = [
 
 [[package]]
 name = "tor-rtcompat"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f62271c3dcae0a80cea669d37ea6e45fc60d5a59b48b9a4fb2caeb8346e3be4"
+checksum = "edda713133a1abf729ecc24af2616aa0ee4631098fc0e3617eeb704a647c8ed1"
 dependencies = [
  "async-native-tls",
  "async-trait",
@@ -10271,9 +10281,9 @@ dependencies = [
 
 [[package]]
 name = "tor-rtmock"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f85a9db27e18e1141340183249999404ea0dfaead0117e2535705dbed59d04e4"
+checksum = "99076aa2a63a6f3aa2de8d2f2b96d306d5efc5f9b48aa187205081dab34b2778"
 dependencies = [
  "amplify",
  "assert_matches",
@@ -10300,9 +10310,9 @@ dependencies = [
 
 [[package]]
 name = "tor-socksproto"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9ca35781e3eea82b6b2c1a68c8be87a53157bb6ce6c12401f825745d4fac9b"
+checksum = "8cc359b08eb4c85ff4a33e32e0c0794beedd81b7f2f0b10c0c17300e3af57085"
 dependencies = [
  "amplify",
  "caret",
@@ -10317,9 +10327,9 @@ dependencies = [
 
 [[package]]
 name = "tor-units"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ddc10f6c42aa268a8b680e68063f7f26da10fd71200d973659c55328b42845b"
+checksum = "0282fefcdc3dd57699fa6a6a6db6fbc3d70824146472cffdf97503032aa51e3d"
 dependencies = [
  "derive-deftly 1.0.1",
  "derive_more",
diff --git a/Cargo.toml b/Cargo.toml
index 0d3ef215..66163b0e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -79,26 +79,26 @@ usvg = "0.45.1"
 ring = "0.16.20"
 
 ## tor
-arti-client = { version = "0.29.0", features = ["pt-client", "static", "onion-service-service", "onion-service-client"] }
-tor-rtcompat = { version = "0.29.0", features = ["static"] }
-tor-config = "0.29.0"
+arti-client = { version = "0.30.0", features = ["pt-client", "static", "onion-service-service", "onion-service-client"] }
+tor-rtcompat = { version = "0.30.0", features = ["static"] }
+tor-config = "0.30.0"
 fs-mistrust = "0.9.1"
-tor-hsservice = "0.29.0"
-tor-hsrproxy = "0.29.0"
-tor-keymgr = "0.29.0"
-tor-llcrypto = "0.29.0"
-tor-hscrypto = "0.29.0"
-tor-error = "0.29.0"
+tor-hsservice = "0.30.0"
+tor-hsrproxy = "0.30.0"
+tor-keymgr = "0.30.0"
+tor-llcrypto = "0.30.0"
+tor-hscrypto = "0.30.0"
+tor-error = "0.30.0"
 sha2 = "0.10.8"
 ed25519-dalek = "2.1.1"
 curve25519-dalek = "4.1.3"
-hyper = { version = "0.14.31", features = ["full"] }
+hyper-tor = { version = "0.14.32", features = ["full"], package = "hyper" }
 hyper-tls = "0.5.0"
 tls-api = "0.12.0"
 tls-api-native-tls = "0.12.1"
 
 ## stratum server
-tokio-old = {version = "0.2", features = ["full"], package = "tokio" }
+tokio-old = { version = "0.2", features = ["full"], package = "tokio" }
 tokio-util-old = { version = "0.2", features = ["codec"], package = "tokio-util" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
diff --git a/src/tor/http.rs b/src/tor/http.rs
index 7cd06986..692942e8 100644
--- a/src/tor/http.rs
+++ b/src/tor/http.rs
@@ -19,10 +19,10 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 use arti_client::{DataStream, IntoTorAddr, TorClient};
-use hyper::client::connect::{Connected, Connection};
-use hyper::http::uri::Scheme;
-use hyper::http::Uri;
-use hyper::service::Service;
+use hyper_tor::client::connect::{Connected, Connection};
+use hyper_tor::http::uri::Scheme;
+use hyper_tor::http::Uri;
+use hyper_tor::service::Service;
 use pin_project::pin_project;
 use thiserror::Error;
 use tls_api::TlsConnector as TlsConn; // This is different from tor_rtcompat::TlsConnector
diff --git a/src/tor/tor.rs b/src/tor/tor.rs
index a2f16b7f..3ecaf5b3 100644
--- a/src/tor/tor.rs
+++ b/src/tor/tor.rs
@@ -28,7 +28,6 @@ use curve25519_dalek::digest::Digest;
 use ed25519_dalek::hazmat::ExpandedSecretKey;
 use fs_mistrust::Mistrust;
 use grin_util::secp::SecretKey;
-use hyper::{Body, Uri};
 use parking_lot::RwLock;
 use sha2::Sha512;
 use tls_api_native_tls::TlsConnector;
@@ -135,17 +134,17 @@ impl Tor {
         // Create http tor-powered client to post data.
         let tls_connector = TlsConnector::builder().unwrap().build().unwrap();
         let tor_connector = ArtiHttpConnector::new(client, tls_connector);
-        let http = hyper::Client::builder().build::<_, Body>(tor_connector);
+        let http = hyper_tor::Client::builder().build::<_, hyper_tor::Body>(tor_connector);
         // Create request.
-        let req = hyper::Request::builder()
-            .method(hyper::Method::POST)
+        let req = hyper_tor::Request::builder()
+            .method(hyper_tor::Method::POST)
             .uri(url)
-            .body(Body::from(body))
+            .body(hyper_tor::Body::from(body))
             .unwrap();
         // Send request.
         let mut resp = None;
         match http.request(req).await {
-            Ok(r) => match hyper::body::to_bytes(r).await {
+            Ok(r) => match hyper_tor::body::to_bytes(r).await {
                 Ok(raw) => resp = Some(String::from_utf8_lossy(&raw).to_string()),
                 Err(_) => {}
             },
@@ -276,12 +275,12 @@ impl Tor {
                             }
                             runtime
                                 .spawn(async move {
-                                    let tls_connector =
+                                    let tls_conn =
                                         TlsConnector::builder().unwrap().build().unwrap();
-                                    let tor_connector =
-                                        ArtiHttpConnector::new(client_check.clone(), tls_connector);
+                                    let tor_conn =
+                                        ArtiHttpConnector::new(client_check.clone(), tls_conn);
                                     let http =
-                                        hyper::Client::builder().build::<_, Body>(tor_connector);
+                                        hyper_tor::Client::builder().build::<_, hyper_tor::Body>(tor_conn);
 
                                     const MAX_ERRORS: i32 = 3;
                                     let mut errors_count = 0;
@@ -295,7 +294,7 @@ impl Tor {
                                         }
                                         // Send request.
                                         let duration = match http
-                                            .get(Uri::from_str(url.clone().as_str()).unwrap())
+                                            .get(hyper_tor::Uri::from_str(url.clone().as_str()).unwrap())
                                             .await
                                         {
                                             Ok(_) => {