mirror of
https://code.gri.mw/GUI/grim.git
synced 2026-07-04 05:57:29 +00:00
build: update tor arti 0.29.0
This commit is contained in:
ardocrat
Generated
+201
-172
@@ -450,15 +450,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
|
||||
|
||||
[[package]]
|
||||
name = "arti-client"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4734bde002bb3d52e27ab808faa971a143d48d11dbd836d5c02edd1756cdab06"
|
||||
checksum = "32ef6ce4ca6686d6a8561872d01791f0b9f23ea4455a7f1340850d0fac049817"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"cfg-if 1.0.0",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"educe",
|
||||
"fs-mistrust",
|
||||
"futures 0.3.31",
|
||||
@@ -468,7 +468,7 @@ dependencies = [
|
||||
"libc",
|
||||
"once_cell",
|
||||
"postage",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"safelog",
|
||||
"serde",
|
||||
"thiserror 2.0.11",
|
||||
@@ -579,6 +579,12 @@ dependencies = [
|
||||
"syn 2.0.96",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "assert_matches"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
|
||||
|
||||
[[package]]
|
||||
name = "async-broadcast"
|
||||
version = "0.7.1"
|
||||
@@ -1603,15 +1609,6 @@ version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
|
||||
|
||||
[[package]]
|
||||
name = "convert_case"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
|
||||
dependencies = [
|
||||
"unicode-segmentation",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "convert_case"
|
||||
version = "0.7.1"
|
||||
@@ -2194,35 +2191,13 @@ dependencies = [
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derive_more"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
|
||||
dependencies = [
|
||||
"derive_more-impl 1.0.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derive_more"
|
||||
version = "2.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
|
||||
dependencies = [
|
||||
"derive_more-impl 2.0.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derive_more-impl"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
|
||||
dependencies = [
|
||||
"convert_case 0.6.0",
|
||||
"proc-macro2 1.0.93",
|
||||
"quote 1.0.37",
|
||||
"syn 2.0.96",
|
||||
"unicode-xid 0.2.6",
|
||||
"derive_more-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2231,7 +2206,7 @@ version = "2.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
|
||||
dependencies = [
|
||||
"convert_case 0.7.1",
|
||||
"convert_case",
|
||||
"proc-macro2 1.0.93",
|
||||
"quote 1.0.37",
|
||||
"syn 2.0.96",
|
||||
@@ -3108,9 +3083,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "fs-mistrust"
|
||||
version = "0.9.0"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24bebe6ec0d7bd8eab0ea285dcf5dd9bcb7c334e47259a6a7c486bfdf0e0f1dd"
|
||||
checksum = "cf4cb1d3bd5de41d56855c3aa0b35fa49d7cf2ff987f25d92df10f0b8c53c3b0"
|
||||
dependencies = [
|
||||
"derive_builder_fork_arti",
|
||||
"dirs 6.0.0",
|
||||
@@ -7020,7 +6995,7 @@ dependencies = [
|
||||
"rand_core 0.4.2",
|
||||
"rand_hc 0.1.0",
|
||||
"rand_isaac",
|
||||
"rand_jitter",
|
||||
"rand_jitter 0.1.4",
|
||||
"rand_os",
|
||||
"rand_pcg",
|
||||
"rand_xorshift",
|
||||
@@ -7182,6 +7157,17 @@ dependencies = [
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_jitter"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b16df48f071248e67b8fc5e866d9448d45c08ad8b672baaaf796e2f15e606ff0"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_core 0.9.3",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_os"
|
||||
version = "0.1.3"
|
||||
@@ -7192,7 +7178,7 @@ dependencies = [
|
||||
"fuchsia-cprng",
|
||||
"libc",
|
||||
"rand_core 0.4.2",
|
||||
"rdrand",
|
||||
"rdrand 0.4.0",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
||||
@@ -7327,6 +7313,15 @@ dependencies = [
|
||||
"rand_core 0.3.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rdrand"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d92195228612ac8eed47adbc2ed0f04e513a4ccb98175b6f2bd04d963b533655"
|
||||
dependencies = [
|
||||
"rand_core 0.6.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "recvmsg"
|
||||
version = "1.0.0"
|
||||
@@ -7809,11 +7804,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
|
||||
|
||||
[[package]]
|
||||
name = "safelog"
|
||||
version = "0.4.3"
|
||||
version = "0.4.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78c9c2fb898b8b41e90b84234baf8075a7f30cf120101e42afe34acbf4c50ac8"
|
||||
checksum = "fba05ad561772e139a16a49088b2d332f659ef49953d56e09cf0f726784e5fdd"
|
||||
dependencies = [
|
||||
"derive_more 1.0.0",
|
||||
"derive_more",
|
||||
"educe",
|
||||
"either",
|
||||
"fluid-let",
|
||||
@@ -8527,6 +8522,15 @@ dependencies = [
|
||||
"strum_macros 0.26.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strum"
|
||||
version = "0.27.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
|
||||
dependencies = [
|
||||
"strum_macros 0.27.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strum_macros"
|
||||
version = "0.18.0"
|
||||
@@ -8552,6 +8556,19 @@ dependencies = [
|
||||
"syn 2.0.96",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strum_macros"
|
||||
version = "0.27.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
|
||||
dependencies = [
|
||||
"heck 0.5.0",
|
||||
"proc-macro2 1.0.93",
|
||||
"quote 1.0.37",
|
||||
"rustversion",
|
||||
"syn 2.0.96",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "subtle"
|
||||
version = "2.4.1"
|
||||
@@ -9149,9 +9166,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-async-utils"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d5294c85610f52bcbe36fddde04a3a994c4ec382ceed455cfdc8252be7046008"
|
||||
checksum = "d8af0bcb05f22eea7c8d4015082019963c592e300de1c692af6c3c418c080eb0"
|
||||
dependencies = [
|
||||
"derive-deftly 1.0.1",
|
||||
"educe",
|
||||
@@ -9165,17 +9182,17 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-basic-utils"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e97f88c41653613190a717185e9e208575cb4df256ba404daff05721f27f10d"
|
||||
checksum = "182be53685e694cf90ce7e696e116cc0b01434522f17f12ce374b51f7a40bfc9"
|
||||
dependencies = [
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"hex",
|
||||
"itertools 0.14.0",
|
||||
"libc",
|
||||
"paste",
|
||||
"rand 0.8.5",
|
||||
"rand_chacha 0.3.1",
|
||||
"rand 0.9.0",
|
||||
"rand_chacha 0.9.0",
|
||||
"serde",
|
||||
"slab",
|
||||
"smallvec",
|
||||
@@ -9184,15 +9201,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-bytes"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "357650fb5bff5e94e5ecc7ee26c6af3f584c2be178b45da8f5ab81cf9f9d4795"
|
||||
checksum = "ea40884e6a999280e985e758a230366c9e976da70df899574751151631b4c864"
|
||||
dependencies = [
|
||||
"bytes 1.7.2",
|
||||
"derive-deftly 1.0.1",
|
||||
"digest 0.10.7",
|
||||
"educe",
|
||||
"getrandom 0.2.15",
|
||||
"getrandom 0.3.2",
|
||||
"safelog",
|
||||
"thiserror 2.0.11",
|
||||
"tor-error",
|
||||
@@ -9202,19 +9219,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-cell"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5341a132563ebeffa45ff60e6519394ee7ba58cb5cf65ba99e7ef879789d87b7"
|
||||
checksum = "fcda4d1dcfdd9a8954a3ff569f3ab3217bb3686c90d3acf5fb3f9576cae47431"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"bitflags 2.9.0",
|
||||
"bytes 1.7.2",
|
||||
"caret",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"educe",
|
||||
"paste",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"smallvec",
|
||||
"thiserror 2.0.11",
|
||||
"tor-basic-utils",
|
||||
@@ -9231,13 +9248,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-cert"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "67a82064ea8ea2864e52e143c978d09570a78bc7e5c2b0056b77068b8893a23f"
|
||||
checksum = "7042c22afc733f256947042bcaaffc28c6ec51d53cb6ecef6d5b1ad6fd3989bd"
|
||||
dependencies = [
|
||||
"caret",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"digest 0.10.7",
|
||||
"thiserror 2.0.11",
|
||||
"tor-bytes",
|
||||
@@ -9247,19 +9264,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-chanmgr"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86fd8969d9a3e6cf289a7f95c15ec11dff339bc94a902f1edf962333bd83270e"
|
||||
checksum = "cf904041fcecc51eb6b4d2b18f6b7265b474b7fe8a3a6f5e9189daa357dbb7b0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"caret",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"educe",
|
||||
"futures 0.3.31",
|
||||
"oneshot-fused-workaround",
|
||||
"postage",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"safelog",
|
||||
"serde",
|
||||
"thiserror 2.0.11",
|
||||
@@ -9282,9 +9299,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-checkable"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f1671c146d35ead4a350a50d7d2b25230635c0271539d310d92ea8d7c777313"
|
||||
checksum = "b3f44a30f1c7c924bfdc9e358ed197ed3bd0a6fa9b7a3271d6dc367a5e08f3fd"
|
||||
dependencies = [
|
||||
"humantime",
|
||||
"signature 2.2.0",
|
||||
@@ -9294,16 +9311,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-circmgr"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e42aaf170fb526b16ff38d18d2f2967da7e5fd934e94a565beee3716ec480a8"
|
||||
checksum = "e36a9a7d2c457482ce17ba086c623ddc7109fb9f2143170d65cbefc0ee3474ef"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"async-trait",
|
||||
"bounded-vec-deque",
|
||||
"cfg-if 1.0.0",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"downcast-rs 2.0.1",
|
||||
"dyn-clone",
|
||||
"educe",
|
||||
@@ -9313,7 +9330,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"oneshot-fused-workaround",
|
||||
"pin-project",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"retry-error",
|
||||
"safelog",
|
||||
"serde",
|
||||
@@ -9342,9 +9359,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-config"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bca6cc0af790f5f02d8a06c8f692fa471207de2739d8b2921c04f9570af34d75"
|
||||
checksum = "74c04314fef18dd6ea027c4dbe64e34bd9b5f2c900fa6b8fe331b68ced55591d"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"cfg-if 1.0.0",
|
||||
@@ -9364,7 +9381,7 @@ dependencies = [
|
||||
"serde",
|
||||
"serde-value",
|
||||
"serde_ignored",
|
||||
"strum 0.26.3",
|
||||
"strum 0.27.1",
|
||||
"thiserror 2.0.11",
|
||||
"toml 0.8.19",
|
||||
"tor-basic-utils",
|
||||
@@ -9376,9 +9393,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-config-path"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "27d35f2df5e5a8968069280e9170ae6c617c637e69d075baf582bd925d0e3902"
|
||||
checksum = "6162c71d9cdab7a8cd249be2c0c922f6a4ac926fc32d03b320696f426260d9cc"
|
||||
dependencies = [
|
||||
"directories",
|
||||
"once_cell",
|
||||
@@ -9391,9 +9408,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-consdiff"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b9c48e1e8cc9c925ae5bdca8c71952886d2407f1f286cc4d8f4f7aad082d6a6"
|
||||
checksum = "a4a0b9697be65ba2e9dae30f536e5dff4d3489d30ea1f5df862afacb91dfdca9"
|
||||
dependencies = [
|
||||
"digest 0.10.7",
|
||||
"hex",
|
||||
@@ -9403,13 +9420,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-dirclient"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5acde3549254949099b072ae4c71c98b93fe4f059c8e5cba4b055df546c9fac"
|
||||
checksum = "b4416c5031e75625b620c2a56e1051993076b3e8574f79ec0251e2b736da2f1e"
|
||||
dependencies = [
|
||||
"async-compression",
|
||||
"base64ct",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"futures 0.3.31",
|
||||
"hex",
|
||||
"http 1.1.0",
|
||||
@@ -9431,14 +9448,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-dirmgr"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "183418366135eeab826f01f0fc87fed2de389ac938d37575e3443075f17797dd"
|
||||
checksum = "97978e4080932866d8a8cae042fd20a72f3fa91095834dced74bd4f6ceaa4180"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"base64ct",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"digest 0.10.7",
|
||||
"educe",
|
||||
"event-listener",
|
||||
@@ -9454,13 +9471,14 @@ dependencies = [
|
||||
"oneshot-fused-workaround",
|
||||
"paste",
|
||||
"postage",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"rusqlite",
|
||||
"safelog",
|
||||
"scopeguard",
|
||||
"serde",
|
||||
"signature 2.2.0",
|
||||
"strum 0.26.3",
|
||||
"static_assertions",
|
||||
"strum 0.27.1",
|
||||
"thiserror 2.0.11",
|
||||
"time",
|
||||
"tor-async-utils",
|
||||
@@ -9483,17 +9501,17 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-error"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d5c23ce991df37473f65aef31df61f1b038f422ef7daf1d934eda9e533ef9843"
|
||||
checksum = "e6488b3bf0c82b1880505ea060bfa8dc24d380e16efe354e3449a283f4212b73"
|
||||
dependencies = [
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"futures 0.3.31",
|
||||
"once_cell",
|
||||
"paste",
|
||||
"retry-error",
|
||||
"static_assertions",
|
||||
"strum 0.26.3",
|
||||
"strum 0.27.1",
|
||||
"thiserror 2.0.11",
|
||||
"tracing",
|
||||
"void",
|
||||
@@ -9501,26 +9519,26 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-general-addr"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f35f8ecb457f99f655c805f6c5cc855c63e71fa84c24a48e11e9fc51a7d7ad4b"
|
||||
checksum = "7551ba9b4449958e5f072d85501e9f2c32ae8002f438c5383465c2369e642813"
|
||||
dependencies = [
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"thiserror 2.0.11",
|
||||
"void",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tor-guardmgr"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29a8f3ddf135d23e2c5443e97fb30c635767daa44923b142915d22bdaf47e2ea"
|
||||
checksum = "c1d0877a98542eaa2b9f669336c9132fe35cb8ee530af94ad50bce407af23088"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"base64ct",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"dyn-clone",
|
||||
"educe",
|
||||
"futures 0.3.31",
|
||||
@@ -9531,10 +9549,10 @@ dependencies = [
|
||||
"oneshot-fused-workaround",
|
||||
"pin-project",
|
||||
"postage",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"safelog",
|
||||
"serde",
|
||||
"strum 0.26.3",
|
||||
"strum 0.27.1",
|
||||
"thiserror 2.0.11",
|
||||
"tor-async-utils",
|
||||
"tor-basic-utils",
|
||||
@@ -9555,24 +9573,24 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-hsclient"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f3375865b29afe4281b86b41e04764be57f1f8c3dad1d544847b9968d530bab4"
|
||||
checksum = "a6fc936ee17c88f83bab968c21e6f631904fc441cd01e1d0b219b12668134dbe"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"educe",
|
||||
"either",
|
||||
"futures 0.3.31",
|
||||
"itertools 0.14.0",
|
||||
"oneshot-fused-workaround",
|
||||
"postage",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"retry-error",
|
||||
"safelog",
|
||||
"slotmap-careful",
|
||||
"strum 0.26.3",
|
||||
"strum 0.27.1",
|
||||
"thiserror 2.0.11",
|
||||
"tor-async-utils",
|
||||
"tor-basic-utils",
|
||||
@@ -9598,18 +9616,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-hscrypto"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34606b731a6c9b24f102124947e8f4be85cd86d90816f4c5ff62c43776d557c5"
|
||||
checksum = "2e2ddacd739dd691bb3623e045ef07d8660d157f5a882e9b996b79f5e3803fa0"
|
||||
dependencies = [
|
||||
"cipher 0.4.4",
|
||||
"data-encoding",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"digest 0.10.7",
|
||||
"humantime",
|
||||
"itertools 0.14.0",
|
||||
"paste",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"safelog",
|
||||
"signature 2.2.0",
|
||||
"subtle",
|
||||
@@ -9627,9 +9646,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-hsrproxy"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b6b9bc8be85b99a8ea454862dc7e32b206d1c3a749a19f78640fe7f903448551"
|
||||
checksum = "dd2ea44027924b8868fc7de05389766257d90bc04eb1f2652b32d62280c20ed5"
|
||||
dependencies = [
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_builder_fork_arti",
|
||||
@@ -9654,9 +9673,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-hsservice"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7f9bf415fc2ba6ecd193a3c84043f2688ea7f948cc17a33b68402a4adfbe4e8"
|
||||
checksum = "52e6609424df5d0830d0182ee4f77df5f8246767b0433993e2d7a0816914ac48"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"async-trait",
|
||||
@@ -9664,7 +9683,7 @@ dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"digest 0.10.7",
|
||||
"educe",
|
||||
"fs-mistrust",
|
||||
@@ -9677,13 +9696,13 @@ dependencies = [
|
||||
"once_cell",
|
||||
"oneshot-fused-workaround",
|
||||
"postage",
|
||||
"rand 0.8.5",
|
||||
"rand_core 0.6.4",
|
||||
"rand 0.9.0",
|
||||
"rand_core 0.9.3",
|
||||
"retry-error",
|
||||
"safelog",
|
||||
"serde",
|
||||
"serde_with",
|
||||
"strum 0.26.3",
|
||||
"strum 0.27.1",
|
||||
"thiserror 2.0.11",
|
||||
"tor-async-utils",
|
||||
"tor-basic-utils",
|
||||
@@ -9712,15 +9731,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-key-forge"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b22ecf1c5b6bfa7849bf92cad3daab16bbc741ac62a61c9fea47c8be2f982e01"
|
||||
checksum = "ac47ab4aff8c0af8cf92b5dd3984e830c4da564bb48f06630aa7f951c688f0ba"
|
||||
dependencies = [
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"downcast-rs 2.0.1",
|
||||
"paste",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"signature 2.2.0",
|
||||
"ssh-key",
|
||||
"thiserror 2.0.11",
|
||||
@@ -9733,16 +9752,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-keymgr"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06c16e10a2bd5888e0c22e92638aa4ac90cd9971f0bf302a10a6c907662323a4"
|
||||
checksum = "e0a0bc40b735b3d1e04d8ac550bce66d40ea84ef5fc47a76fc8f64713b4abe3f"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"arrayvec 0.7.6",
|
||||
"cfg-if 1.0.0",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"downcast-rs 2.0.1",
|
||||
"dyn-clone",
|
||||
"fs-mistrust",
|
||||
@@ -9750,7 +9769,7 @@ dependencies = [
|
||||
"humantime",
|
||||
"inventory",
|
||||
"itertools 0.14.0",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"serde",
|
||||
"signature 2.2.0",
|
||||
"ssh-key",
|
||||
@@ -9771,22 +9790,22 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-linkspec"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "119c9fe01c6dace496dd137aba8ad6d92324a1dbdd4515a9348c499723c0f742"
|
||||
checksum = "b12f5be8e6077b66ec04e64b7e1a779e77af44893b5454cd0928289c45767780"
|
||||
dependencies = [
|
||||
"base64ct",
|
||||
"by_address",
|
||||
"caret",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"hex",
|
||||
"itertools 0.14.0",
|
||||
"safelog",
|
||||
"serde",
|
||||
"serde_with",
|
||||
"strum 0.26.3",
|
||||
"strum 0.27.1",
|
||||
"thiserror 2.0.11",
|
||||
"tor-basic-utils",
|
||||
"tor-bytes",
|
||||
@@ -9798,9 +9817,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-llcrypto"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "85dbde770a588d073ae16dc743f51a135bd6d041943a82395b05365ed6c69a0f"
|
||||
checksum = "057afeb075f0689c40465646a1b7671baffebd3c8dd40e62ed5013a5ab157e76"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"base64ct",
|
||||
@@ -9808,13 +9827,19 @@ dependencies = [
|
||||
"curve25519-dalek 4.1.3",
|
||||
"der-parser",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"digest 0.10.7",
|
||||
"ed25519-dalek 2.1.1",
|
||||
"educe",
|
||||
"getrandom 0.2.15",
|
||||
"getrandom 0.3.2",
|
||||
"hex",
|
||||
"once_cell",
|
||||
"rand 0.9.0",
|
||||
"rand_chacha 0.9.0",
|
||||
"rand_core 0.6.4",
|
||||
"rand_core 0.9.3",
|
||||
"rand_jitter 0.5.0",
|
||||
"rdrand 0.8.3",
|
||||
"rsa",
|
||||
"safelog",
|
||||
"serde",
|
||||
@@ -9832,9 +9857,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-log-ratelim"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "80aed29a8c53e55664e9dd4b99561dec2621dcedaa25116e58dd795fa6bf07f1"
|
||||
checksum = "68b4f7d6adb39d73c414e891b37abd380a1e1eb1545735da422581128b1a9274"
|
||||
dependencies = [
|
||||
"futures 0.3.31",
|
||||
"humantime",
|
||||
@@ -9848,12 +9873,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-memquota"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d63eef6dd4d38b16199cf201de07b6de4a6af310f67bd71067d22ef746eb1a1d"
|
||||
checksum = "c86c061032e8d1b2922016fbe40b48a967dc7a3c09cd5bb0e3a33a00dad210ef"
|
||||
dependencies = [
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"dyn-clone",
|
||||
"educe",
|
||||
"futures 0.3.31",
|
||||
@@ -9876,23 +9901,23 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-netdir"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e17883b3b2ef17a5f9ad4ae8a78de2c4b3d629ccfeb66c15c4cb33494384f08"
|
||||
checksum = "d8a7a1ff78d5bc186836ffe50012dfdd7e9a137a692201d5e8dd204df2c1f608"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bitflags 2.9.0",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"digest 0.10.7",
|
||||
"futures 0.3.31",
|
||||
"hex",
|
||||
"humantime",
|
||||
"itertools 0.14.0",
|
||||
"num_enum",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"serde",
|
||||
"static_assertions",
|
||||
"strum 0.26.3",
|
||||
"strum 0.27.1",
|
||||
"thiserror 2.0.11",
|
||||
"time",
|
||||
"tor-basic-utils",
|
||||
@@ -9909,24 +9934,25 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-netdoc"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aec11efe729e4ca9c5b03a8702f94b82dfd0ab450c0d58c4ca5ee9e4c49e6f89"
|
||||
checksum = "3bafcb9dc0ac3ef8ab6e2006ab892699797cb8381e18a0248e138027a6817c8b"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"base64ct",
|
||||
"bitflags 2.9.0",
|
||||
"cipher 0.4.4",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"digest 0.10.7",
|
||||
"educe",
|
||||
"hex",
|
||||
"humantime",
|
||||
"itertools 0.14.0",
|
||||
"memchr",
|
||||
"once_cell",
|
||||
"phf",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"serde",
|
||||
"serde_with",
|
||||
"signature 2.2.0",
|
||||
@@ -9953,13 +9979,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-persist"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be9958219e20477aef5645f99d0d3695e01bb230bbd36a0fd4c207f5428abe6b"
|
||||
checksum = "a245023c2109228264d03ef7c1c549e41052b9a2a8b193acb8f98d82ad5982bf"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"filetime",
|
||||
"fs-mistrust",
|
||||
"fslock",
|
||||
@@ -9982,9 +10008,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-proto"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9ef488ff76f3cd9e6c8e4376c90dc526a27d74a53363a5f86af426d61c42edd9"
|
||||
checksum = "1ea421e41f1e2cc5ac8b990610d0a69a330532a863b344c44812a815af25811a"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"asynchronous-codec",
|
||||
@@ -9995,7 +10021,7 @@ dependencies = [
|
||||
"coarsetime",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_builder_fork_arti",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"digest 0.10.7",
|
||||
"educe",
|
||||
"futures 0.3.31",
|
||||
@@ -10004,8 +10030,8 @@ dependencies = [
|
||||
"hmac 0.12.1",
|
||||
"oneshot-fused-workaround",
|
||||
"pin-project",
|
||||
"rand 0.8.5",
|
||||
"rand_core 0.6.4",
|
||||
"rand 0.9.0",
|
||||
"rand_core 0.9.3",
|
||||
"safelog",
|
||||
"slotmap-careful",
|
||||
"static_assertions",
|
||||
@@ -10038,19 +10064,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-protover"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a7d228eda4c7e7c96fff6a5f6759d1bd03bad69b62b9d94f2ac409de3518b8a"
|
||||
checksum = "a887114e6ed2f2e2b291c16cfcf751e26298fb2be4599b0a44cae47a588dc4ae"
|
||||
dependencies = [
|
||||
"caret",
|
||||
"paste",
|
||||
"thiserror 2.0.11",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tor-ptmgr"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "65a49254c95ab7c39bf626c595bb583894bae3437d5e33b75ebf40f53ae4f9b4"
|
||||
checksum = "97076372ccf3aea12652b839c913c6762c208809f7f28bcca353eef88fb398c6"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"cfg-if 1.0.0",
|
||||
@@ -10075,11 +10102,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-relay-selection"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e41754428684bd62892df2c74c2d11128cfbf3f1a8a9aaa1b920fcb90e04961a"
|
||||
checksum = "ba0d8a53a12c0fbdb1b842f0705629bacf11ab2c99531a58952c53fa619f830f"
|
||||
dependencies = [
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"serde",
|
||||
"tor-basic-utils",
|
||||
"tor-linkspec",
|
||||
@@ -10089,19 +10116,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-rtcompat"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4956b5e707d288e22f77809507e67a79a11db9054a29a44af00f93ff7cb6c2c7"
|
||||
checksum = "4f62271c3dcae0a80cea669d37ea6e45fc60d5a59b48b9a4fb2caeb8346e3be4"
|
||||
dependencies = [
|
||||
"async-native-tls",
|
||||
"async-trait",
|
||||
"async_executors",
|
||||
"asynchronous-codec",
|
||||
"coarsetime",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"dyn-clone",
|
||||
"educe",
|
||||
"futures 0.3.31",
|
||||
"hex",
|
||||
"libc",
|
||||
"native-tls",
|
||||
"paste",
|
||||
@@ -10117,14 +10145,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-rtmock"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9077af79aac5ad0c5336af1cc41a31c617bbc09261210a2427deb84f14356857"
|
||||
checksum = "f85a9db27e18e1141340183249999404ea0dfaead0117e2535705dbed59d04e4"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"assert_matches",
|
||||
"async-trait",
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"educe",
|
||||
"futures 0.3.31",
|
||||
"humantime",
|
||||
@@ -10133,7 +10162,7 @@ dependencies = [
|
||||
"pin-project",
|
||||
"priority-queue",
|
||||
"slotmap-careful",
|
||||
"strum 0.26.3",
|
||||
"strum 0.27.1",
|
||||
"thiserror 2.0.11",
|
||||
"tor-error",
|
||||
"tor-general-addr",
|
||||
@@ -10145,9 +10174,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-socksproto"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d3892f6d0c323b87a2390f41e91c0294c6d5852f00e955e41e85a0116636e82d"
|
||||
checksum = "cf9ca35781e3eea82b6b2c1a68c8be87a53157bb6ce6c12401f825745d4fac9b"
|
||||
dependencies = [
|
||||
"amplify",
|
||||
"caret",
|
||||
@@ -10162,12 +10191,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tor-units"
|
||||
version = "0.28.0"
|
||||
version = "0.29.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7388f506c9278d07421e6799aa8a912adee4ea6921b3dd08a1247a619de82124"
|
||||
checksum = "1ddc10f6c42aa268a8b680e68063f7f26da10fd71200d973659c55328b42845b"
|
||||
dependencies = [
|
||||
"derive-deftly 1.0.1",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more",
|
||||
"thiserror 2.0.11",
|
||||
"tor-memquota",
|
||||
]
|
||||
|
||||
+10
-10
@@ -77,16 +77,16 @@ gif = "0.13.1"
|
||||
rkv = { version = "0.19.0", features = ["lmdb"] }
|
||||
|
||||
## tor
|
||||
arti-client = { version = "0.28.0", features = ["pt-client", "static", "onion-service-service", "onion-service-client"] }
|
||||
tor-rtcompat = { version = "0.28.0", features = ["static"] }
|
||||
tor-config = "0.28.0"
|
||||
fs-mistrust = "0.9.0"
|
||||
tor-hsservice = "0.28.0"
|
||||
tor-hsrproxy = "0.28.0"
|
||||
tor-keymgr = "0.28.0"
|
||||
tor-llcrypto = "0.28.0"
|
||||
tor-hscrypto = "0.28.0"
|
||||
tor-error = "0.28.0"
|
||||
arti-client = { version = "0.29.0", features = ["pt-client", "static", "onion-service-service", "onion-service-client"] }
|
||||
tor-rtcompat = { version = "0.29.0", features = ["static"] }
|
||||
tor-config = "0.29.0"
|
||||
fs-mistrust = "0.9.1"
|
||||
tor-hsservice = "0.29.0"
|
||||
tor-hsrproxy = "0.29.0"
|
||||
tor-keymgr = "0.29.0"
|
||||
tor-llcrypto = "0.29.0"
|
||||
tor-hscrypto = "0.29.0"
|
||||
tor-error = "0.29.0"
|
||||
sha2 = "0.10.8"
|
||||
ed25519-dalek = "2.1.1"
|
||||
curve25519-dalek = "4.1.3"
|
||||
|
||||
@@ -18,7 +18,7 @@ use egui::{Id, RichText};
|
||||
use grin_core::core::{amount_from_hr_string, amount_to_hr_string};
|
||||
use grin_wallet_libwallet::{Error, SlatepackAddress};
|
||||
use parking_lot::RwLock;
|
||||
use tor_rtcompat::BlockOn;
|
||||
use tor_rtcompat::ToplevelBlockOn;
|
||||
use tor_rtcompat::tokio::TokioNativeTlsRuntime;
|
||||
use crate::gui::Colors;
|
||||
use crate::gui::platform::PlatformCallbacks;
|
||||
|
||||
+4
-2
@@ -14,6 +14,8 @@
|
||||
|
||||
#![windows_subsystem = "windows"]
|
||||
|
||||
use tor_rtcompat::ToplevelBlockOn;
|
||||
|
||||
pub fn main() {
|
||||
#[allow(dead_code)]
|
||||
#[cfg(not(target_os = "android"))]
|
||||
@@ -173,7 +175,7 @@ fn start_desktop_gui(platform: grim::gui::platform::Desktop) {
|
||||
#[allow(dead_code)]
|
||||
#[cfg(not(target_os = "android"))]
|
||||
fn is_app_running(data: &Option<String>) -> bool {
|
||||
use tor_rtcompat::BlockOn;
|
||||
use tor_rtcompat::ToplevelBlockOn;
|
||||
let runtime = tor_rtcompat::tokio::TokioNativeTlsRuntime::create().unwrap();
|
||||
let res: Result<(), Box<dyn std::error::Error>> = runtime
|
||||
.block_on(async {
|
||||
@@ -212,7 +214,7 @@ fn is_app_running(data: &Option<String>) -> bool {
|
||||
#[cfg(not(target_os = "android"))]
|
||||
fn start_app_socket(platform: grim::gui::platform::Desktop) {
|
||||
std::thread::spawn(move || {
|
||||
use tor_rtcompat::BlockOn;
|
||||
use tor_rtcompat::ToplevelBlockOn;
|
||||
let runtime = tor_rtcompat::tokio::TokioNativeTlsRuntime::create().unwrap();
|
||||
let _: Result<_, _> = runtime
|
||||
.block_on(async {
|
||||
|
||||
+3
-2
@@ -263,7 +263,8 @@ impl Tor {
|
||||
return;
|
||||
}
|
||||
let client_check = client_thread.clone();
|
||||
let url = format!("http://{}/", service.onion_name().unwrap().to_string());
|
||||
let addr = service.onion_address().unwrap().to_string();
|
||||
let url = format!("http://{}/", addr);
|
||||
thread::spawn(move || {
|
||||
// Wait 1 second to start.
|
||||
thread::sleep(Duration::from_millis(1000));
|
||||
@@ -305,7 +306,7 @@ impl Tor {
|
||||
// Remove service from failed.
|
||||
let mut w_services =
|
||||
TOR_SERVER_STATE.failed_services.write();
|
||||
w_services.remove(id);
|
||||
w_services.remove(&service_id);
|
||||
// Check again after 50 seconds.
|
||||
Duration::from_millis(50000)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user