Commit 3c85863a authored by Ian Jackson's avatar Ian Jackson 💬
Browse files

Merge branch 'exp' into 'main' 

tor-error: Make KeystoreFsPermissions experimental for now

See merge request tpo/core/arti!1350
parents 9ef65775 69129bf2

crates/tor-error/src/lib.rs

+3 −0
Original line number Diff line number Diff line
@@ -233,6 +233,9 @@ pub enum ErrorKind { 
    /// being too permissive; the next likeliest cause is that we were unable to

    /// check the permissions on the file or directory, or on one of its

    /// ancestors.

    #[cfg(feature = "experimental-api")]

    // TODO HSS: KeystoreFsPermissions

    // See https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/1315#note_2916498

    #[display(fmt = "problem with keystore filesystem permissions")]

    KeystoreFsPermissions,

crates/tor-keymgr/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ default = [] 
#

# These APIs are not covered by semantic versioning.  Using this

# feature voids your "semver warrantee".

keymgr = ["__is_experimental"]

keymgr = ["__is_experimental", "tor-error/experimental"]

__is_experimental = []



[dependencies]