Commit 1c277db9 authored by juga's avatar juga
Browse files

Merge branch 'artideps+macos' into 'main' 

Update cargo.toml deps to latest.

See merge request !47
parents b4177c1d b5d56280

Cargo.lock

+868 −947

File changed.

Preview size limit exceeded, changes collapsed.

Cargo.toml

+26 −26
Original line number Diff line number Diff line
@@ -19,22 +19,22 @@ default = [ "tokio" ] 
tokio = [ "tor-rtcompat/tokio" ]



[dependencies]

anyhow = "1.0"

async-trait = "0.1"

clap = { version = "4.3", features = ["derive"] }

chrono = { version = "0.4" }

config = { version="0.11", default-features=false }

futures = "0.3"

anyhow = "1.0.86"

async-trait = "0.1.81"

clap = { version = "4.5.16", features = ["derive"] }

chrono = { version = "0.4.38" }

config = { version="0.14.0", default-features=false }

futures = "0.3.30"

hex = { version = "0.4" }

ipnetwork = "0.17"

ipnetwork = "0.20.0"

levenshtein = "1.0"

multimap = "0.8"

prettytable-rs = "0.8"

multimap = "0.10.0"

prettytable-rs = "0.10.0"

rand = "0.8"

serde = { version = "1.0", features = ["derive"] }

serde = { version = "1.0.209", features = ["derive"] }

simple-logging = "2.0"

thiserror = "1.0"

tokio-crate = { package = "tokio", version = "1.7", features = [

thiserror = "1.0.63"

tokio-crate = { package = "tokio", version = "1.39.3", features = [

    "io-util",

    "macros",

    "net",
@@ -42,22 +42,22 @@ tokio-crate = { package = "tokio", version = "1.7", features = [ 
    "rt",

    "time",

] }

tracing = "0.1"

tracing-subscriber = { version = "0.3", features = ["env-filter"] }

tracing = "0.1.40"

tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }



# Last versions, increment them as they change:

# https://gitlab.torproject.org/tpo/core/arti/-/tags

# experimental implies experimental-api and enables experimental in the crates

# dependencies.

arti-client = {version = "0.18", features = ["experimental"]}

tor-chanmgr = {version = "0.18"}

tor-circmgr = {version = "0.18", features = ["experimental-api", "specific-relay"] }

tor-config = {version = "0.18" }

tor-dirmgr = {version = "0.18" }

tor-geoip = {version = "0.18"}

tor-linkspec = {version = "0.18"}

tor-llcrypto = {version = "0.18"}

tor-netdir = {version = "0.18", features = ["experimental-api"]}

tor-netdoc = {version = "0.18" }

tor-proto = {version = "0.18" }

tor-rtcompat = {version = "0.18", features = ["tokio"]}
 
arti-client = {version = "0.21.0", features = ["experimental"]}

tor-chanmgr = {version = "0.21.0"}

tor-circmgr = {version = "0.21.0", features = ["experimental-api", "specific-relay"] }

tor-config = {version = "0.21.0" }

tor-dirmgr = {version = "0.21.0" }

tor-geoip = {version = "0.21.0"}

tor-linkspec = {version = "0.21.0"}

tor-llcrypto = {version = "0.21.0"}

tor-netdir = {version = "0.21.0", features = ["experimental-api"]}

tor-netdoc = {version = "0.21.0" }

tor-proto = {version = "0.21.0" }

tor-rtcompat = {version = "0.21.0", features = ["tokio"]}

src/cli/outcfg.rs

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ mod tests { 
        .to_string();

        assert_eq!(expected_data, reject_string);

        fs::remove_file(fpath).unwrap();

        fs::remove_dir("/tmp/approved-routers.d").unwrap();

        fs::remove_dir(root_path.join("approved-routers.d")).unwrap();



        let fpath = root_path.join(BAD_PATH);

        let data = fs::read_to_string(fpath);

testdata/fps.txt

+0 −1
Original line number Diff line number Diff line 
0123456789abcdef0123456789abcdef0123456

0123456789abcdef0123456789abcdef01234567

0011BD2485AD45D984EC4159C88FC066E5E3300E