bitcoin/bitcoin

236686b [init] Add missing help for args (MarcoFalke)
44438a1 [init] Fix error message of maxtxfee invalid amount (MarcoFalke)
a74fa1f [Wallet] Transaction View: LastMonth calculation fixed (crowning-)

52b29dc Get rid of inaccurate ScriptSigArgsExpected (Pieter Wuille)

Github-Pull: #7364
Rebased-From: fa6a59d

Add a configuration option `-permitrbf` to set transaction replacement policy
for the mempool.

Enabling it will enable (opt-in) RBF, disabling it will refuse all
conflicting transactions.

Conflicts:
	src/init.cpp
	src/main.cpp
	src/main.h

Github-Pull: #7386
Rebased-From: b768108

Add "bip125-replaceable" output field to listtransactions and gettransaction
which indicates if an unconfirmed transaction, or any unconfirmed parent, is
signaling opt-in RBF according to BIP 125.

Github-Pull: #7286
Rebased-From: eaa8d27

Github-Pull: #7328
Rebased-From: b07b103

These are changes I needed to get gitian building to work with Debian
8.2, which is the version we tell to use.

- Set up NAT, so that container can access network beyond host
- Remove explicit cgroup setup - these are mounted automatically now
- gitian: Need `ca-certificates` and `python` for LXC builds

Github-Pull: #7060
Rebased-From: 99fda26 3b468a0

Github-Pull: #7381
Rebased-From: fa6d4cc

fa31133 [Doc] Wallet & Pruning (MarcoFalke)

Github-Pull: #7373
Rebased-From: 4a04879

Github-Pull: #7290
Rebased-From: fa6ab96 faa572a fa461df

Github-Pull: #7290
Rebased-From: fac11ea

Github-Pull: #7327
Rebased-From: 30cdace

- Add assert_is_hex_string and assert_is_hash_string to RPC test utils.
- Add RPC documentation for getblockheader[chainwork].
- Add RPC tests for getblockheader.

Github-Pull: #7194
Rebased-From: 16d4fce 4745636 135d6ec

Github-Pull: #7232
Rebased-From: 94bdd71

Github-Pull: #7335
Rebased-From: 7777994

fa8c497 [doc] backwards-compatibility issues due to chainstate obfuscation (MarcoFalke)

f17b00b release-notes: Combine NOP2->CLTV asm change into "RPC: Low-level API changes" section (Luke Dashjr)
e20704b Replace some instances of formatWithUnit with formatHtmlWithUnit (fanquake)
6f8346d qt5: Use the fixed font the system recommends (MarcoFalke)
605de4a Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (mb300sd)
6191a9b [RPC-Tests] add option to run rpc test over QT clients (Jonas Schnelli)
6307beb Note that reviewers should mention the commit hash of the commits they reviewed. (Patrick Strateman)
6092ff2 Set link from http:// to https:// (Suriyaa Kudo)

5cacb8f Add comment about mining changes and more about priority (Alex Morcos)

2e552b0 Mention mempool chain limits in release notes (Suhas Daftuar)

Conflicts:
	configure.ac

Github-Pull: #7363
Rebased-From: bd34174

Github-Pull: #7368
Rebased-From: 4d10d2e

82667af release note fixups (Alex Morcos)

It is unneeded after the last toolchain update, and missing from Trusty.

Github-Pull: #7342
Rebased-From: 3503a78

… changes" section

Strings in a HTML context should be using formatHtmlWithUnit.

Github-Pull: #7255
Rebased-From: 5fdf32d

Github-Pull: #7214
Rebased-From: fa2f4bc

Github-Pull: #7213
Rebased-From: 37d271d