Fixes a bug in AcceptBlock() in invoking CheckBlock() with incorrect
arguments, and restores a call to CheckBlock() from ProcessNewBlock()
as belt-and-suspenders.

Updates the (overspecified) tests to match behavior.

178454dd Contrib: Add jtimon pgp keys for commit sigs and future gitian builds (Jorge Timón)

ba94426d Test that pushes to bitcoin/bitcoin are signed per verify-commits (Matt Corallo)
3e900aca Require merge commits merge branches on top of other merge commits (Matt Corallo)

8fc69893 Remove redundant semicolons (practicalswift)

b9d95bd9 Fix various minor linearization script issues (Douglas Roark)

3eba88d4 clarify listunspent amount description (Gregory Sanders)

Specifically, require that the left branch (first restult of git
show -s --format=format:%P) is a signed merge commit, instead of
allowing either. This is fine for now, but might need to be relaxed
in the future.

Also fixes an out-of-file-descriptors issue by holding too many
open FDs writing to /dev/null

29fb3118 Increase minimum debug.log size to 10MB after shrink. (Alex Morcos)

9522b53a rpc: bumpfee: handle errors more gracefully (Suhas Daftuar)
f6265944 rpc: bumpfee: use correct maximum signed tx size for fee calculation (Suhas Daftuar)
d625b907 wallet: Refactor dummy signature signing for reusability (Suhas Daftuar)

More accurate than simply adding one byte per input, and properly handles the
case where the original transaction happened to have very small signatures

95f97f4b Skip RAII event tests if libevent is built without event_set_mem_functions (Luke Dashjr)

fa5137c1 [doc] Remove unused clang format dev script (MarcoFalke)

b7b48c8b Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)

23661806 Do not add to vNodes until fOneShot/fFeeler/fAddNode have been set (Matt Corallo)
3c37dc40 Ensure cs_vNodes is held when using the return value from FindNode (Matt Corallo)
5be01906 Delete some unused (and broken) functions in CConnman (Matt Corallo)

4b189c13 Change bumpfee result value from 'oldfee' to 'origfee'. (Alex Morcos)
0c0c63f7 Introduce WALLET_INCREMENTAL_RELAY_FEE (Alex Morcos)
e8021ec9 Use CWallet::GetMinimumFee in bumpfee (Alex Morcos)
ae9719ab Refactor GetMinimumFee to give option of providing targetFee (Alex Morcos)
fe8e8efc [rpc] Add incremental relay fee to getnetworkinfo (Alex Morcos)
6b331e6c Fix to have miner test aware of new separate block min tx fee (Alex Morcos)
de6400de Fix missing use of dustRelayFee (Alex Morcos)
5b158707 Use incrementalRelayFee for BIP 125 replacement (Alex Morcos)

b5f374fe qt: fix build with zlib for target (Cory Fields)
8efa34fb depends: add a zlib build (Cory Fields)
342eb961 build: find qt's renamed helper libs from 5.7 (Cory Fields)

cc16d99f [trivial] Fix typos in comments (practicalswift)

Also, update the clang format file to reflect the current coding
style mentioned in the developer notes.

This contains a few hacks very specific to Qt's buildsystem. These can be
reverted once we split the build between native and target builds.

Qt's build contains a circular dependency when not using a system zlib.
By far the easiest fix is to switch to a system zlib, rather than Qt's own.
However, that confuses Qt's cross build which assumes that when using a system
zlib, it should also find a system (native) zlib for native tools. The build
breaks if that zlib is not present.

To solve this:
1. Always use a system zlib rather than the one provided by qt
2. Set force_bootstrap, which instructs the build tools to be built as though
   we're cross-compiling (build != target)
3. For build tools, use qt's internal zlib so that a native zlib is not
required.

Step 3 means that if any zlib headers are found by the native build, it will
confuse Qt's internal zlib build. So we also need to make sure that the target
headers/libs aren't found. To do so, specify that our
cflags/cxx...

qt5.7 changed the location of some of its symbols, creating a circular
dependency in Qt5Core. Rather than trying to fix that up, build our own zlib
rather than having it built for us.

fab035f2 qa: Actually test assertions in pruning.py (MarcoFalke)

04b87736 [Qt] fix transaction details output-index to reflect vout index (Jonas Schnelli)

The result value indicates the actual fee on the transaction that was replaced. But there is an error message which uses the description 'oldfee' to refer to the original fee rate applied to the new transaction's estimated max size.  It was confusing that two different uses of 'oldfee' had two different numeric values.

Have wallet's default bump value be higher than the default incrementalRelayFee to future proof against changes to incremental relay fee.  Only applies when not setting the fee rate directly.

Also refactor to use wrapper for stop_node

Use the wallet's fee calculation logic to properly clamp fee against minimums and maximums when calculating the fee for a bumpfee transaction.  Unless totalFee is explictly given, in which case, manually check against min, but do nothing to adjust given fee.

In all cases do a final check against maxTxFee (after adding any incremental amount).

de1ae324 Exclude RBF txs from fee estimation (Alex Morcos)

8ff8d219 Send final alert message to older peers after connecting. (Gregory Maxwell)

c36ec715 depends: qt: disable printer for all platforms, not just osx (Cory Fields)