Commit bc3afc6a authored by gabi-250's avatar gabi-250 🕸️
Browse files

Merge branch 'fixup-features' into 'main' 

Run fixup-features in preparation for release

See merge request tpo/core/arti!2381
parents fbd4c537 8e455b85

crates/arti-client/Cargo.toml

+2 −0
Original line number Diff line number Diff line
@@ -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 = []

crates/arti-rpcserver/Cargo.toml

+2 −2
Original line number Diff line number Diff line
@@ -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" }

crates/arti/Cargo.toml

+11 −1
Original line number Diff line number Diff line
@@ -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 = []

crates/tor-chanmgr/Cargo.toml

+3 −1
Original line number Diff line number Diff line
@@ -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"]

crates/tor-circmgr/Cargo.toml

+3 −1
Original line number Diff line number Diff line
@@ -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"]