Merge commit '6c0a672d6643b82b336160da5d3c05cbd2167967' into merge_upstream

This commit is contained in:
Cryptoforge
2020-09-05 21:55:14 -07:00
11 changed files with 1979 additions and 320 deletions

View File

@@ -29,7 +29,7 @@ ring = "0.16.9"
libflate = "0.1"
subtle = "2"
threadpool = "1.8.0"
num_cpus = "1.13.0"
num_cpus = "1.12.0"
tonic = { version = "0.2.1", features = ["tls", "tls-roots"] }
bytes = "0.4"