7 files changed, 99 insertions, 6 deletions
diff --git a/crates/tor-hsclient/Cargo.toml b/crates/tor-hsclient/Cargo.toml
index 37e850fa5..28d568b3b 100644
--- a/crates/tor-hsclient/Cargo.toml
+++ b/crates/tor-hsclient/Cargo.toml
@@ -29,7 +29,7 @@ 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-rtcompat/full", "tor-basic-utils/full", "tor-bytes/full", "tor-cell/full", "tor-keymgr/full", "tor-async-utils/full", "tor-persist/full",
 ]
 __is_experimental = []
 experimental = ["keymgr"]
diff --git a/crates/tor-hsservice/Cargo.toml b/crates/tor-hsservice/Cargo.toml
index 5aedd4e12..d033a85f9 100644
--- a/crates/tor-hsservice/Cargo.toml
+++ b/crates/tor-hsservice/Cargo.toml
@@ -34,7 +34,7 @@ full = [
     "tor-linkspec/full",
     "tor-netdoc/full",
     "tor-units/full",
-    "tor-persist/full", "tor-protover/full", "fs-mistrust/full",
+    "tor-persist/full", "tor-protover/full", "fs-mistrust/full", "tor-log-ratelim/full",
 ]
 
 [dependencies]
diff --git a/crates/tor-keymgr/Cargo.toml b/crates/tor-keymgr/Cargo.toml
index 9c1645f8c..e05b76d32 100644
--- a/crates/tor-keymgr/Cargo.toml
+++ b/crates/tor-keymgr/Cargo.toml
@@ -20,7 +20,7 @@ default = []
 
 keymgr = ["__is_experimental"]
 __is_experimental = []
-full = ["fs-mistrust/full", "tor-error/full", "tor-hscrypto/full", "tor-llcrypto/full", "tor-config/full"]
+full = ["fs-mistrust/full", "tor-error/full", "tor-hscrypto/full", "tor-llcrypto/full", "tor-config/full", "tor-persist/full"]
 experimental = ["keymgr", "testing"]
 
 testing = ["__is_experimental"]
diff --git a/crates/tor-persist/Cargo.toml b/crates/tor-persist/Cargo.toml
index 38348bee5..2e78eda4b 100644
--- a/crates/tor-persist/Cargo.toml
+++ b/crates/tor-persist/Cargo.toml
@@ -18,7 +18,7 @@ state-dir = ["__is_experimental", "amplify", "fslock-guard", "void"]
 # covered by semver.
 testing = ["__is_experimental"]
 
-full = ["fs-mistrust/full", "tor-error/full"]
+full = ["fs-mistrust/full", "tor-error/full", "fslock-guard?/full"]
 
 experimental = ["state-dir", "testing"]
 __is_experimental = []
diff --git a/crates/tor-proto/Cargo.toml b/crates/tor-proto/Cargo.toml
index 26710b8ba..57aec1684 100644
--- a/crates/tor-proto/Cargo.toml
+++ b/crates/tor-proto/Cargo.toml
@@ -33,7 +33,7 @@ full = [
     "tor-rtcompat/full",
     "tor-rtmock/full",
     "tor-units/full",
-    "tor-hscrypto?/full",
+    "tor-hscrypto?/full", "tor-log-ratelim/full",
 ]
 
 experimental = ["experimental-api", "ntor_v3", "stream-ctrl", "testing"]
diff --git a/maint/fixup-features/.gitignore b/maint/fixup-features/.gitignore
index fa8d85ac5..eb5a316cb 100644
--- a/maint/fixup-features/.gitignore
+++ b/maint/fixup-features/.gitignore
@@ -1,2 +1 @@
-Cargo.lock
 target
diff --git a/maint/fixup-features/Cargo.lock b/maint/fixup-features/Cargo.lock
new file mode 100644
index 000000000..e3a691f9d
--- /dev/null
+++ b/maint/fixup-features/Cargo.lock
@@ -0,0 +1,94 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "anyhow"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "fixup-features"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "pico-args",
+ "toml_edit",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
+[[package]]
+name = "indexmap"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "winnow"
+version = "0.5.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5"
+dependencies = [
+ "memchr",
+]