5 files changed, 57 insertions, 21 deletions
diff --git a/crates/arti-relay/Cargo.toml b/crates/arti-relay/Cargo.toml
index 2d99e3985..58dc7323d 100644
--- a/crates/arti-relay/Cargo.toml
+++ b/crates/arti-relay/Cargo.toml
@@ -28,6 +28,7 @@ full = [
     "tor-config-path/full",
     "tor-llcrypto/full",
     "tor-persist/full",
+    "tor-general-addr/full",
 ]
 
 [dependencies]
diff --git a/crates/arti/Cargo.toml b/crates/arti/Cargo.toml
index f5e6c0eb3..72319789c 100644
--- a/crates/arti/Cargo.toml
+++ b/crates/arti/Cargo.toml
@@ -10,6 +10,8 @@ description = "A rust implementation of the Tor privacy tools."
 keywords = ["tor", "arti", "privacy", "anonymity"]
 categories = ["command-line-utilities", "cryptography"]
 repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
+[package.metadata.docs.rs]
+all-features = true
 #
 # We need a runtime
 # @@ test-all-crates conditional-option minimal --features=default-runtime
@@ -64,9 +66,18 @@ full = [
     "tor-key-forge/full",
     "tor-keymgr/full",
     "tor-hscrypto?/full",
+    "tor-cell?/full",
+    "tor-hsclient?/full",
+    "tor-proto?/full",
+    "futures-copy/full",
 ]
 
-async-std = ["arti-client/async-std", "tor-rtcompat/async-std", "async-ctrlc", "async-signal"]
+async-std = [
+    "arti-client/async-std",
+    "tor-rtcompat/async-std",
+    "async-ctrlc",
+    "async-signal",
+]
 bridge-client = ["arti-client/bridge-client"]
 default-runtime = ["tokio", "native-tls"]
 dns-proxy = ["hickory-proto"]
@@ -101,7 +112,12 @@ rpc = ["arti-rpcserver", "tor-rpcbase", "tor-rpc-connect", "derive-deftly"]
 # This is not nonadditive from a software POV, but we mark it as such because it
 # includes code licensed under the old OpenSSL license (which was 4-clause BSD),
 # which in turn introduces a GPL-incompatibility.
-rustls = ["arti-client/rustls", "tor-rtcompat/rustls", "rustls-crate", "__is_nonadditive"]
+rustls = [
+    "arti-client/rustls",
+    "tor-rtcompat/rustls",
+    "rustls-crate",
+    "__is_nonadditive",
+]
 
 # depends directly on arti-client/static so native-tls doesn't get automatically included
 static = ["arti-client/static", "__is_nonadditive"]
@@ -144,12 +160,24 @@ experimental = [
     "opentelemetry",
     "tokio-console",
 ]
-metrics = ["dep:metrics-exporter-prometheus", "tor-hsservice?/metrics", "tor-hsrproxy?/metrics", "__is_experimental"]
-http-connect = ["__is_experimental", "base64ct", "http", "hyper", "tor-error/http", "tor-cell", "tor-proto"]
+metrics = [
+    "dep:metrics-exporter-prometheus",
+    "tor-hsservice?/metrics",
+    "tor-hsrproxy?/metrics",
+    "__is_experimental",
+]
+http-connect = [
+    "__is_experimental",
+    "base64ct",
+    "http",
+    "hyper",
+    "tor-error/http",
+    "tor-cell",
+    "tor-proto",
+]
 hsc = ["onion-service-client", "experimental-api", "keymgr", "__is_experimental"]
 tokio-console = ["dep:console-subscriber", "__is_experimental"]
 __is_experimental = []
-
 # These features exist for backwards compatibility, and shouldn't be used directly.
 # Next time we do a version bump, it would be good to get rid of them.
 
@@ -173,6 +201,7 @@ derive-deftly = { version = "~1.5.0", features = ["full", "beta"], optional = tr
 derive_builder = { version = "0.11", package = "derive_builder_fork_arti" }
 fs-mistrust = { path = "../fs-mistrust", version = "0.13.0" }
 futures = "0.3.14"
+futures-copy = { version = "0.2.0", path = "../futures-copy" }
 hickory-proto = { version = "0.25.2", optional = true }
 http = { version = "1.3.1", optional = true }
 humantime = "2"
@@ -184,6 +213,11 @@ metrics-exporter-prometheus = { version = "0.17.0", optional = true, default-fea
     "http-listener",
 ] }
 notify = { version = "8", default-features = false, features = ["macos_kqueue"] }
+opentelemetry = { version = "0.31.0", optional = true }
+opentelemetry-appender-tracing = { version = "0.31.1", optional = true }
+opentelemetry-otlp = { version = "0.31.0", optional = true }
+opentelemetry-proto = { version = "0.31.0", optional = true }
+opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio"], optional = true } # TODO: what's up with this feature
 paste = "1"
 pin-project = "1"
 postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
@@ -196,6 +230,7 @@ rustls-crate = { package = "rustls", version = "0.23.5", optional = true, defaul
 safelog = { path = "../safelog", version = "0.7.0" }
 secmem-proc = { version = "0.3.4", optional = true }
 serde = { version = "1.0.103", features = ["derive"] }
+serde_json = "1.0.50"
 thiserror = "2"
 time = "0.3.18"
 tokio-crate = { package = "tokio", version = "1.7", optional = true, features = ["signal"] }
@@ -221,17 +256,13 @@ tor-socksproto = { path = "../tor-socksproto", version = "0.36.0" }
 tracing = "0.1.36"
 tracing-appender = "0.2.0"
 tracing-journald = { version = "0.3.0", optional = true }
+
+tracing-opentelemetry = { version = "0.32.0", optional = true }
 tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
 visibility = { version = "0.1.0", optional = true }
 
-tracing-opentelemetry = { version = "0.32.0", optional = true }
-opentelemetry = { version = "0.31.0", optional = true }
-opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio"], optional = true } # TODO: what's up with this feature
-opentelemetry-otlp = { version = "0.31.0", optional = true }
-opentelemetry-appender-tracing = { version = "0.31.1", optional = true }
-opentelemetry-proto = { version = "0.31.0", optional = true }
-serde_json = "1.0.50"
-futures-copy = { version = "0.2.0", path = "../futures-copy" }
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3.8", features = ["winerror"] }
 
 [dev-dependencies]
 amplify = { version = "4", default-features = false, features = ["derive"] }
@@ -252,8 +283,3 @@ tor-memquota = { version = "0.36.0", path = "../tor-memquota", default-features
 tor-rtmock = { path = "../tor-rtmock", version = "0.36.0" }
 trycmd = "0.15.4"
 walkdir = "2"
-[package.metadata.docs.rs]
-all-features = true
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.8", features = ["winerror"] }
diff --git a/crates/futures-copy/Cargo.toml b/crates/futures-copy/Cargo.toml
index 3505e72cf..cc2ef03e2 100644
--- a/crates/futures-copy/Cargo.toml
+++ b/crates/futures-copy/Cargo.toml
@@ -12,6 +12,9 @@ keywords = ["futures", "tor", "arti"]
 categories = ["rust-patterns", "network-programming"]
 repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 
+[features]
+full = []
+
 [dependencies]
 futures = "0.3.14"
 pin-project = "1"
diff --git a/crates/tor-dirserver/Cargo.toml b/crates/tor-dirserver/Cargo.toml
index 219429ffd..fa9bd1d09 100644
--- a/crates/tor-dirserver/Cargo.toml
+++ b/crates/tor-dirserver/Cargo.toml
@@ -12,6 +12,14 @@ keywords = ["tor", "arti"]
 categories = ["rust-patterns"]
 repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 
+[features]
+full = [
+    "tor-error/full",
+    "tor-basic-utils/full",
+    "tor-dircommon/full",
+    "tor-netdoc/full",
+]
+
 [dependencies]
 bytes = "1.10.1"
 futures = "0.3.31"
@@ -44,6 +52,3 @@ sha2 = "0.10.9"
 tempfile = "3.23.0"
 tokio-stream = { version = "0.1.17", features = ["full"] }
 zstd = "0.13.3"
-
-[features]
-full = ["tor-error/full"]
diff --git a/crates/tor-hsrproxy/Cargo.toml b/crates/tor-hsrproxy/Cargo.toml
index 4d19ac809..689736359 100644
--- a/crates/tor-hsrproxy/Cargo.toml
+++ b/crates/tor-hsrproxy/Cargo.toml
@@ -27,6 +27,7 @@ full = [
     "tor-async-utils/full",
     "tor-log-ratelim/full",
     "oneshot-fused-workaround/full",
+    "futures-copy/full",
 ]
 
 # Enable experimental APIs that are not yet officially supported.