summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crates/arti-client/Cargo.toml2
-rw-r--r--crates/arti-rpcserver/Cargo.toml4
-rw-r--r--crates/arti/Cargo.toml12
-rw-r--r--crates/tor-chanmgr/Cargo.toml4
-rw-r--r--crates/tor-circmgr/Cargo.toml4
-rw-r--r--crates/tor-config/Cargo.toml2
-rw-r--r--crates/tor-dirmgr/Cargo.toml1
-rw-r--r--crates/tor-guardmgr/Cargo.toml5
-rw-r--r--crates/tor-hsclient/Cargo.toml9
-rw-r--r--crates/tor-hsrproxy/Cargo.toml4
-rw-r--r--crates/tor-hsservice/Cargo.toml4
-rw-r--r--crates/tor-memquota/Cargo.toml9
-rw-r--r--crates/tor-persist/Cargo.toml9
-rw-r--r--crates/tor-proto/Cargo.toml4
-rw-r--r--crates/tor-ptmgr/Cargo.toml2
-rw-r--r--crates/tor-rtmock/Cargo.toml2
16 files changed, 62 insertions, 15 deletions
diff --git a/crates/arti-client/Cargo.toml b/crates/arti-client/Cargo.toml
index 17cab5d5c..3557f6eb3 100644
--- a/crates/arti-client/Cargo.toml
+++ b/crates/arti-client/Cargo.toml
@@ -100,6 +100,7 @@ experimental = [
"tor-config/experimental",
"tor-guardmgr/experimental",
"tor-hsservice/experimental",
+ "restricted-discovery",
]
# Enable experimental APIs that are not yet officially supported.
@@ -111,6 +112,7 @@ dirfilter = ["tor-dirmgr/dirfilter", "__is_experimental"]
error_detail = ["__is_experimental"]
geoip = ["tor-circmgr/geoip", "tor-dirmgr/geoip", "tor-geoip", "__is_experimental"]
rpc = ["dyn-clone", "tor-rpcbase", "__is_experimental"]
+
restricted-discovery = ["tor-hsservice/restricted-discovery", "__is_experimental"]
__is_experimental = []
diff --git a/crates/arti-rpcserver/Cargo.toml b/crates/arti-rpcserver/Cargo.toml
index e7e128e6c..5f2faad2b 100644
--- a/crates/arti-rpcserver/Cargo.toml
+++ b/crates/arti-rpcserver/Cargo.toml
@@ -22,7 +22,7 @@ full = [
"tor-bytes/full",
"tor-llcrypto/full",
"tor-proto/full",
- "describe-methods",
+ "describe-methods", "oneshot-fused-workaround/full", "slotmap-careful/full",
]
describe-methods = ["tor-rpcbase/describe-methods"]
@@ -41,7 +41,7 @@ pin-project = "1"
rand = "0.8"
serde = { version = "1.0.103", features = ["derive"] }
serde_json = "1.0.50"
-slotmap-careful = { path = "../slotmap-careful", version = "*" }
+slotmap-careful = { path = "../slotmap-careful", version = "0.1.0" }
thiserror = "1"
tiny-keccak = { version = "2", features = ["kmac"] }
tor-async-utils = { path = "../tor-async-utils", version = "0.21.0" }
diff --git a/crates/arti/Cargo.toml b/crates/arti/Cargo.toml
index 442daee57..84e8d3f56 100644
--- a/crates/arti/Cargo.toml
+++ b/crates/arti/Cargo.toml
@@ -52,6 +52,7 @@ full = [
"tor-hsrproxy?/full",
"tor-hsservice?/full",
"arti-relay?/full",
+ "tor-async-utils/full",
]
async-std = ["arti-client/async-std", "tor-rtcompat/async-std", "async-ctrlc", "signal-hook", "signal-hook-async-std"]
@@ -88,8 +89,17 @@ compression = ["arti-client/compression"]
# This feature flag enables experimental features that are not supported. Turning it on may
# void your API.
-experimental = ["arti-client/experimental", "tor-hsservice/experimental", "experimental-api", "rpc", "relay", "keymgr"]
+experimental = [
+ "arti-client/experimental",
+ "tor-hsservice/experimental",
+ "experimental-api",
+ "rpc",
+ "relay",
+ "keymgr",
+ "restricted-discovery",
+]
rpc = ["arti-rpcserver", "tor-rpcbase", "derive-deftly", "__is_experimental"]
+
restricted-discovery = ["tor-hsservice/restricted-discovery", "__is_experimental"]
__is_experimental = []
diff --git a/crates/tor-chanmgr/Cargo.toml b/crates/tor-chanmgr/Cargo.toml
index 6850d198c..ee19cb796 100644
--- a/crates/tor-chanmgr/Cargo.toml
+++ b/crates/tor-chanmgr/Cargo.toml
@@ -28,7 +28,9 @@ full = [
"tor-proto/full",
"tor-rtcompat/full",
"tor-socksproto/full",
- "tor-units/full", "tor-async-utils/full",
+ "tor-units/full",
+ "tor-async-utils/full",
+ "oneshot-fused-workaround/full",
]
pt-client = ["tor-linkspec/pt-client"]
diff --git a/crates/tor-circmgr/Cargo.toml b/crates/tor-circmgr/Cargo.toml
index 0231d7cdb..809d4ec6c 100644
--- a/crates/tor-circmgr/Cargo.toml
+++ b/crates/tor-circmgr/Cargo.toml
@@ -34,7 +34,9 @@ full = [
"tor-rtcompat/full",
"tor-geoip?/full",
"tor-async-utils/full",
- "tor-protover/full", "tor-relay-selection/full",
+ "tor-protover/full",
+ "tor-relay-selection/full",
+ "oneshot-fused-workaround/full",
]
specific-relay = []
vanguards = ["tor-guardmgr/vanguards"]
diff --git a/crates/tor-config/Cargo.toml b/crates/tor-config/Cargo.toml
index ff0b57872..d133764b7 100644
--- a/crates/tor-config/Cargo.toml
+++ b/crates/tor-config/Cargo.toml
@@ -14,7 +14,7 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
[features]
default = ["expand-paths"]
-full = ["expand-paths", "fs-mistrust/full", "tor-basic-utils/full", "tor-error/full"]
+full = ["expand-paths", "fs-mistrust/full", "tor-basic-utils/full", "tor-error/full", "tor-rtcompat/full"]
experimental = ["experimental-api"]
# Enable experimental APIs that are not yet officially supported.
diff --git a/crates/tor-dirmgr/Cargo.toml b/crates/tor-dirmgr/Cargo.toml
index 85c1f253d..0ca4dd97a 100644
--- a/crates/tor-dirmgr/Cargo.toml
+++ b/crates/tor-dirmgr/Cargo.toml
@@ -35,6 +35,7 @@ full = [
"tor-geoip?/full",
"tor-async-utils/full",
"tor-persist/full",
+ "oneshot-fused-workaround/full",
]
experimental = ["experimental-api", "dirfilter", "geoip"]
bridge-client = ["tor-circmgr/specific-relay", "tor-guardmgr/bridge-client", "routerdesc"]
diff --git a/crates/tor-guardmgr/Cargo.toml b/crates/tor-guardmgr/Cargo.toml
index 4e2276248..2098e5a23 100644
--- a/crates/tor-guardmgr/Cargo.toml
+++ b/crates/tor-guardmgr/Cargo.toml
@@ -30,7 +30,10 @@ full = [
"tor-protover?/full",
"tor-rtcompat/full",
"tor-units/full",
- "tor-async-utils/full", "tor-relay-selection/full", "tor-rtmock?/full",
+ "tor-async-utils/full",
+ "tor-relay-selection/full",
+ "tor-rtmock?/full",
+ "oneshot-fused-workaround/full",
]
experimental = ["testing"]
diff --git a/crates/tor-hsclient/Cargo.toml b/crates/tor-hsclient/Cargo.toml
index e75308025..5d872ff18 100644
--- a/crates/tor-hsclient/Cargo.toml
+++ b/crates/tor-hsclient/Cargo.toml
@@ -29,7 +29,14 @@ full = [
"tor-netdir/full",
"tor-netdoc/full",
"tor-proto/full",
- "tor-rtcompat/full", "tor-basic-utils/full", "tor-bytes/full", "tor-cell/full", "tor-keymgr/full", "tor-async-utils/full", "tor-persist/full",
+ "tor-rtcompat/full",
+ "tor-basic-utils/full",
+ "tor-bytes/full",
+ "tor-cell/full",
+ "tor-keymgr/full",
+ "tor-async-utils/full",
+ "tor-persist/full",
+ "oneshot-fused-workaround/full",
]
__is_experimental = []
experimental = ["keymgr"]
diff --git a/crates/tor-hsrproxy/Cargo.toml b/crates/tor-hsrproxy/Cargo.toml
index fe483eef4..8d070ba62 100644
--- a/crates/tor-hsrproxy/Cargo.toml
+++ b/crates/tor-hsrproxy/Cargo.toml
@@ -21,7 +21,9 @@ full = [
"tor-hsservice/full",
"tor-proto/full",
"tor-rtcompat/full",
- "tor-async-utils/full", "tor-log-ratelim/full",
+ "tor-async-utils/full",
+ "tor-log-ratelim/full",
+ "oneshot-fused-workaround/full",
]
# Enable experimental APIs that are not yet officially supported.
diff --git a/crates/tor-hsservice/Cargo.toml b/crates/tor-hsservice/Cargo.toml
index 4e4b7148b..638ad16f6 100644
--- a/crates/tor-hsservice/Cargo.toml
+++ b/crates/tor-hsservice/Cargo.toml
@@ -38,7 +38,9 @@ full = [
"tor-persist/full",
"tor-protover/full",
"fs-mistrust/full",
- "tor-log-ratelim/full", "tor-relay-selection/full",
+ "tor-log-ratelim/full",
+ "tor-relay-selection/full",
+ "oneshot-fused-workaround/full",
]
# Enable experimental APIs that are not yet officially supported.
diff --git a/crates/tor-memquota/Cargo.toml b/crates/tor-memquota/Cargo.toml
index d377075b1..f0bd4bd03 100644
--- a/crates/tor-memquota/Cargo.toml
+++ b/crates/tor-memquota/Cargo.toml
@@ -40,7 +40,14 @@ tor-rtmock = { path = "../tor-rtmock", version = "0.21.0" }
tracing-test = "0.2.4"
[features]
-full = ["tor-config/full", "tor-error/full", "tor-log-ratelim/full", "tor-rtcompat/full"]
+full = [
+ "tor-config/full",
+ "tor-error/full",
+ "tor-log-ratelim/full",
+ "tor-rtcompat/full",
+ "tor-async-utils/full",
+ "tor-basic-utils/full",
+]
memquota = ["__is_experimental"]
experimental = ["memquota"]
__is_experimental = []
diff --git a/crates/tor-persist/Cargo.toml b/crates/tor-persist/Cargo.toml
index accaaca80..85abea34f 100644
--- a/crates/tor-persist/Cargo.toml
+++ b/crates/tor-persist/Cargo.toml
@@ -18,7 +18,14 @@ state-dir = ["__is_experimental", "amplify", "fslock-guard"]
# covered by semver.
testing = ["__is_experimental"]
-full = ["fs-mistrust/full", "tor-error/full", "fslock-guard?/full", "tor-basic-utils/full", "tor-async-utils/full"]
+full = [
+ "fs-mistrust/full",
+ "tor-error/full",
+ "fslock-guard?/full",
+ "tor-basic-utils/full",
+ "tor-async-utils/full",
+ "oneshot-fused-workaround/full",
+]
experimental = ["state-dir", "testing"]
__is_experimental = []
diff --git a/crates/tor-proto/Cargo.toml b/crates/tor-proto/Cargo.toml
index 0c5289a1d..fa5940939 100644
--- a/crates/tor-proto/Cargo.toml
+++ b/crates/tor-proto/Cargo.toml
@@ -32,7 +32,9 @@ full = [
"tor-rtcompat/full",
"tor-rtmock/full",
"tor-units/full",
- "tor-hscrypto?/full", "tor-log-ratelim/full",
+ "tor-hscrypto?/full",
+ "tor-log-ratelim/full",
+ "oneshot-fused-workaround/full",
]
experimental = ["experimental-api", "ntor_v3", "stream-ctrl", "testing"]
diff --git a/crates/tor-ptmgr/Cargo.toml b/crates/tor-ptmgr/Cargo.toml
index 0413b1f28..4468589df 100644
--- a/crates/tor-ptmgr/Cargo.toml
+++ b/crates/tor-ptmgr/Cargo.toml
@@ -25,7 +25,7 @@ full = [
"tor-linkspec/full",
"tor-rtcompat/full",
"tor-socksproto/full",
- "tor-async-utils/full", "tor-basic-utils/full",
+ "tor-async-utils/full", "tor-basic-utils/full", "oneshot-fused-workaround/full",
]
experimental = ["experimental-api"]
diff --git a/crates/tor-rtmock/Cargo.toml b/crates/tor-rtmock/Cargo.toml
index 37ed37f51..fa0911c7e 100644
--- a/crates/tor-rtmock/Cargo.toml
+++ b/crates/tor-rtmock/Cargo.toml
@@ -39,6 +39,6 @@ tor-basic-utils = { path = "../tor-basic-utils", version = "0.21.0" }
tor-rtcompat = { path = "../tor-rtcompat", version = "0.21.0", features = ["tokio", "native-tls"] }
[features]
-full = ["tor-rtcompat/full", "tor-error/full"]
+full = ["tor-rtcompat/full", "tor-error/full", "oneshot-fused-workaround/full"]
[package.metadata.docs.rs]
all-features = true
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-28 17:17:13 +0000