diff options
Diffstat (limited to 'crates/arti-client')
| -rw-r--r-- | crates/arti-client/Cargo.toml | 9 | ||||
| -rw-r--r-- | crates/arti-client/README.md | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/crates/arti-client/Cargo.toml b/crates/arti-client/Cargo.toml index acd9b3e08..744dfe1c1 100644 --- a/crates/arti-client/Cargo.toml +++ b/crates/arti-client/Cargo.toml @@ -19,7 +19,6 @@ default = ["tokio", "native-tls", "compression"] full = [ "anyhow", "keymgr", - "memquota", "onion-service-client", "onion-service-service", "vanguards", @@ -66,7 +65,10 @@ full = [ async-std = ["tor-rtcompat/async-std"] bridge-client = ["tor-guardmgr/bridge-client", "tor-dirmgr/bridge-client"] -memquota = ["tor-memquota/memquota"] +# the "memquota" feature is now a no-op as the functionality is always-enabled, +# but the feature is kept for backwards compatibility +# https://gitlab.torproject.org/tpo/core/arti/-/issues/2030 +memquota = [] tokio = ["tor-rtcompat/tokio", "tor-proto/tokio"] native-tls = ["tor-rtcompat/native-tls"] pt-client = [ @@ -189,8 +191,7 @@ tor-hsservice = { path = "../tor-hsservice", version = "0.32.0", optional = true tor-keymgr = { path = "../tor-keymgr", version = "0.32.0", default-features = false } tor-linkspec = { path = "../tor-linkspec", version = "0.32.0" } tor-llcrypto = { path = "../tor-llcrypto", version = "0.32.0" } -# tor-memquota dependency is unconditional, but most of the code is behind tor-memquota/memquota -tor-memquota = { path = "../tor-memquota", version = "0.32.0", default-features = false } +tor-memquota = { path = "../tor-memquota", version = "0.32.0" } tor-netdir = { path = "../tor-netdir", version = "0.32.0" } tor-netdoc = { path = "../tor-netdoc", version = "0.32.0" } tor-persist = { path = "../tor-persist", version = "0.32.0" } diff --git a/crates/arti-client/README.md b/crates/arti-client/README.md index f8d8792f1..01eb6365f 100644 --- a/crates/arti-client/README.md +++ b/crates/arti-client/README.md @@ -225,7 +225,6 @@ match tor_client.connect(("example.com", 80)).await { * `compression` (default) -- Build support for downloading compressed documents. Requires a C compiler. * `bridge-client` -- Build with support for bridges. -* `memquota` -- Build with support for memory use tracking and limiting. * `onion-service-client` -- Build with support for connecting to onion services. Note that this is not yet as secure as C-Tor and shouldn't be used for security-sensitive purposes. @@ -289,4 +288,12 @@ implementation with another. work reliably. To be explicit: if you want `cargo update` to _only_ make safe changes, then you cannot enable these features. +### Deprecated features + +These features are either not recommended, or are no-op features. +They are included for backwards compatibility. + +* `memquota` -- Memory quota tracking is now always supported, + regardless of if this feature is enabled. + License: MIT OR Apache-2.0 |