diff options
| author | fanquake <fanquake@gmail.com> | 2022-10-14 16:53:16 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-10-14 16:53:31 +0800 |
| commit | 032ceb189acd93676a59963b0aba96ead1a7a201 (patch) | |
| tree | 467df3335b2408f79733c64fb25560b77e00624f /share/examples/bitcoin.conf | |
| parent | 885366c67addd86bf06629919aaa6f74a76f44f4 (diff) | |
| parent | d68b6abeb844daa907c7d8c103efac4092de34c0 (diff) | |
Merge bitcoin/bitcoin#26309: [24.x] Bump version to 24.0rc2v24.0rc2
d68b6abeb844daa907c7d8c103efac4092de34c0 doc: Generate example bitcoin conf for 24.0rc2 (fanquake)
c349096fa26171a6753dc114252d7cecdc9df412 doc: Generate manual pages for 24.0rc2 (fanquake)
e5aec59e0f5c4e7ae1e91e0fe619eec7d8187ea8 build: Bump version to 24.0rc2 (fanquake)
Pull request description:
We are due for an rc2.
Bump version.
Regen manpages.
Regen exmaple bitcoin.conf.
ACKs for top commit:
LarryRuane:
utACK d68b6abeb844daa907c7d8c103efac4092de34c0
jarolrod:
ACK d68b6abeb844daa907c7d8c103efac4092de34c0
hebasto:
ACK d68b6abeb844daa907c7d8c103efac4092de34c0, also verified the diff in `bitcoind -help` output between rc1 and rc2, and its reflection in the last commit.
Tree-SHA512: 258091f68f82b449810f3220170cbb4d22424061a753a3e99edf5df15881885dc74e07c7ba1b45f9b2623cee2dcdaabb82109b0bdce7a30b6623454d5346ddef
Diffstat (limited to 'share/examples/bitcoin.conf')
| -rw-r--r-- | share/examples/bitcoin.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/examples/bitcoin.conf b/share/examples/bitcoin.conf index ab94040283..bbbbe66404 100644 --- a/share/examples/bitcoin.conf +++ b/share/examples/bitcoin.conf @@ -282,9 +282,6 @@ # 0) #peerbloomfilters=1 -# Relay non-P2SH multisig (default: 1) -#permitbaremultisig=1 - # Listen for connections on <port>. Nodes not using the default ports # (default: 8333, testnet: 18333, signet: 38333, regtest: 18444) # are unlikely to get incoming connections. Not relevant for I2P @@ -575,6 +572,9 @@ # relaying, mining and transaction creation (default: 0.00001) #minrelaytxfee=<amt> +# Relay non-P2SH multisig (default: 1) +#permitbaremultisig=1 + # Add 'forcerelay' permission to whitelisted inbound peers with default # permissions. This will relay transactions even if the # transactions were already in the mempool. (default: 0) |