Merge branch 'zcash-2.0.1'

2018-10-11 20:57:50 +01:00
parent 0b6bbfb444 f5e5cb24e1
commit 041671f642
5 changed files with 126 additions and 6 deletions
--- a/librustzcash/Cargo.toml
+++ b/librustzcash/Cargo.toml
@@ -21,6 +21,7 @@ lazy_static = "1"
 byteorder = "1"
 rand = "0.4"
 sapling-crypto = { path = "../sapling-crypto" }
+zip32 = { path = "../zip32" }

 [dependencies.blake2-rfc]
 git = "https://github.com/gtank/blake2-rfc"