Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/qa/pull-tester/tests-config.sh.in
+++ b/qa/pull-tester/tests-config.sh.in
@@ -11,6 +11,7 @@ EXEEXT="@EXEEXT@"
@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
@BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
@ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1
+@ENABLE_PROTON_TRUE@ENABLE_PROTON=1

 REAL_BITCOIND="$BUILDDIR/src/zcashd${EXEEXT}"
 REAL_BITCOINCLI="$BUILDDIR/src/zcash-cli${EXEEXT}"