7 files changed, 13 insertions, 8 deletions
diff --git a/crates/tor-circmgr/src/build.rs b/crates/tor-circmgr/src/build.rs
index 6e9da9b55..8d9ba76b6 100644
--- a/crates/tor-circmgr/src/build.rs
+++ b/crates/tor-circmgr/src/build.rs
@@ -19,7 +19,7 @@ use tor_linkspec::{IntoOwnedChanTarget, OwnedChanTarget, OwnedCircTarget};
 use tor_netdir::params::NetParameters;
 use tor_proto::ClientTunnel;
 use tor_proto::ccparams::{self, AlgorithmType};
-use tor_proto::circuit::{CircParameters, PendingClientTunnel};
+use tor_proto::client::circuit::{CircParameters, PendingClientTunnel};
 use tor_rtcompat::{Runtime, SleepProviderExt};
 use tor_units::Percentage;
 
diff --git a/crates/tor-circmgr/src/hspool.rs b/crates/tor-circmgr/src/hspool.rs
index 0b735fe9d..d85c37ecb 100644
--- a/crates/tor-circmgr/src/hspool.rs
+++ b/crates/tor-circmgr/src/hspool.rs
@@ -28,7 +28,7 @@ use tor_linkspec::{
     CircTarget, HasRelayIds as _, IntoOwnedChanTarget, OwnedChanTarget, OwnedCircTarget,
 };
 use tor_netdir::{NetDir, NetDirProvider, Relay};
-use tor_proto::circuit::{self, CircParameters};
+use tor_proto::client::circuit::{self, CircParameters};
 use tor_relay_selection::{LowLevelRelayPredicate, RelayExclusion};
 use tor_rtcompat::{
     Runtime, SleepProviderExt,
diff --git a/crates/tor-circmgr/src/impls.rs b/crates/tor-circmgr/src/impls.rs
index 746c7bced..24efc9385 100644
--- a/crates/tor-circmgr/src/impls.rs
+++ b/crates/tor-circmgr/src/impls.rs
@@ -15,7 +15,8 @@ use tor_error::{bad_api_usage, internal};
 use tor_guardmgr::vanguards::VanguardMgr;
 use tor_linkspec::CircTarget;
 use tor_proto::ClientTunnel;
-use tor_proto::circuit::{CircParameters, Path, UniqId};
+use tor_proto::circuit::UniqId;
+use tor_proto::client::circuit::{CircParameters, Path};
 use tor_rtcompat::Runtime;
 
 #[async_trait]
diff --git a/crates/tor-circmgr/src/lib.rs b/crates/tor-circmgr/src/lib.rs
index 2f4f95dbc..a111daba4 100644
--- a/crates/tor-circmgr/src/lib.rs
+++ b/crates/tor-circmgr/src/lib.rs
@@ -55,7 +55,8 @@ use tor_error::{error_report, warn_report};
 use tor_guardmgr::RetireCircuits;
 use tor_linkspec::ChanTarget;
 use tor_netdir::{DirEvent, NetDir, NetDirProvider, Timeliness};
-use tor_proto::circuit::{CircParameters, UniqId};
+use tor_proto::circuit::UniqId;
+use tor_proto::client::circuit::CircParameters;
 use tor_rtcompat::Runtime;
 
 #[cfg(any(feature = "specific-relay", feature = "hs-common"))]
diff --git a/crates/tor-circmgr/src/mgr.rs b/crates/tor-circmgr/src/mgr.rs
index e5e586a3c..7839345c5 100644
--- a/crates/tor-circmgr/src/mgr.rs
+++ b/crates/tor-circmgr/src/mgr.rs
@@ -33,7 +33,8 @@ use tor_error::{AbsRetryTime, HasRetryTime, debug_report, info_report, internal,
 #[cfg(feature = "vanguards")]
 use tor_guardmgr::vanguards::VanguardMgr;
 use tor_linkspec::CircTarget;
-use tor_proto::circuit::{CircParameters, Path, UniqId};
+use tor_proto::circuit::UniqId;
+use tor_proto::client::circuit::{CircParameters, Path};
 use tor_rtcompat::{Runtime, SleepProviderExt};
 
 use async_trait::async_trait;
diff --git a/crates/tor-circmgr/src/mocks.rs b/crates/tor-circmgr/src/mocks.rs
index 2338eb7ed..cbef186f7 100644
--- a/crates/tor-circmgr/src/mocks.rs
+++ b/crates/tor-circmgr/src/mocks.rs
@@ -6,7 +6,8 @@ use tor_guardmgr::vanguards::VanguardMgr;
 use tor_guardmgr::{GuardMgr, TestConfig, VanguardConfig};
 use tor_linkspec::CircTarget;
 use tor_persist::StateMgr;
-use tor_proto::circuit::{CircParameters, Path, UniqId};
+use tor_proto::circuit::UniqId;
+use tor_proto::client::circuit::{CircParameters, Path};
 use tor_rtcompat::Runtime;
 
 use async_trait::async_trait;
diff --git a/crates/tor-circmgr/src/tunnel.rs b/crates/tor-circmgr/src/tunnel.rs
index 84891aca4..bcee9ba0f 100644
--- a/crates/tor-circmgr/src/tunnel.rs
+++ b/crates/tor-circmgr/src/tunnel.rs
@@ -10,14 +10,15 @@ use tor_error::internal;
 use tor_linkspec::{CircTarget, IntoOwnedChanTarget, OwnedChanTarget};
 use tor_proto::{
     ClockSkew, TargetHop,
-    circuit::{CircParameters, CircuitBinding, ClientCirc, UniqId},
+    circuit::UniqId,
+    client::circuit::{CircParameters, CircuitBinding, ClientCirc},
     client::stream::{DataStream, StreamParameters},
 };
 
 use crate::{Error, Result};
 
 #[cfg(feature = "hs-common")]
-use tor_proto::circuit::handshake;
+use tor_proto::client::circuit::handshake;
 
 // The tunnel base methods. This MUST be derived on all tunnel types.
 define_derive_deftly! {