Merge remote-tracking branch 'upstream/master' into bazel-patches

.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 @@ libzcashconsensus.pc
 contrib/debian/files
 contrib/debian/substvars
 
+src/fuzzing/*/input
 src/fuzzing/*/output
 src/fuzz.cpp

Cargo.toml

@@ -28,11 +28,19 @@ libc = "0.2"
 pairing = "0.16"
 lazy_static = "1"
 rand_core = "0.5.1"
+tracing = "0.1"
+tracing-core = "0.1"
+tracing-appender = "0.1"
 zcash_history = "0.2"
 zcash_primitives = "0.2"
 zcash_proofs = "0.2"
 ed25519-zebra = "2.0.0"
 
+[dependencies.tracing-subscriber]
+version = "0.2"
+default-features = false
+features = ["ansi", "chrono", "env-filter"]
+
 [profile.release]
 lto = true
 panic = 'abort'

Makefile.am

@@ -169,3 +169,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-man
 clean-local:
 	rm -rf test_bitcoin.coverage/ zcash-gtest.coverage/ total.coverage/
 	rm -rf afl-temp
+
+distclean-local:
+	rm -f zcutil/bin/db_*
+	rmdir zcutil/bin 2>/dev/null || true

README.md

@@ -1,4 +1,4 @@
-Zcash 3.1.0-rc2
+Zcash 3.1.0
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========