Merge commit '881423287afb15e8e64090bf6036c827dea5f95f' into jane/pre…

…compute
ZcashFoundation · Dec 9, 2020 · f8e8a0c · f8e8a0c
2 parents 848eb05 + 8814232
commit f8e8a0c
Show file tree

Hide file tree

Showing 594 changed files with 15,561 additions and 17,522 deletions.
diff --git a/depend/zcash/.gitignore b/depend/zcash/.gitignore
@@ -7,6 +7,7 @@ src/zcash-cli
 src/zcash-gtest
 src/zcash-tx
 src/test/test_bitcoin
+zcutil/bin/
 
 *zcashTest.pk
 *zcashTest.vk
@@ -116,5 +117,6 @@ libzcash_script.pc
 contrib/debian/files
 contrib/debian/substvars
 
+src/fuzzing/*/input
 src/fuzzing/*/output
 src/fuzz.cpp
diff --git a/depend/zcash/COPYING b/depend/zcash/COPYING
@@ -29,11 +29,6 @@ source code is not considered a derived work of these Autoconf macros or of the
 dependencies. For further details see 'contrib/debian/copyright'.
 
 
-This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit (https://www.openssl.org/). This product includes cryptographic
-software written by Eric Young (eay@cryptsoft.com).
-
-
 Although almost all of the Zcash code is licensed under "permissive" open source
 licenses, users and distributors should note that when built using the default
 build options, Zcash depends on Oracle Berkeley DB 6.2.x, which is licensed