Merge branch 'master' into blake2_simd

2019-07-18 18:22:20 +02:00
parent d1ce6749fe 5e3409ea85
commit 8361674efc
10 changed files with 1271 additions and 104 deletions
--- a/zcash_proofs/Cargo.toml
+++ b/zcash_proofs/Cargo.toml
@@ -13,3 +13,4 @@ ff = { path = "../ff" }
 pairing = { path = "../pairing" }
 rand = "0.4"
 sapling-crypto = { path = "../sapling-crypto" }
+zcash_primitives = { path = "../zcash_primitives" }