Skip to content

Commit af591f2

Browse files
committed
Merge bitcoin#22858: [0.21] Final changes for 0.21.2
6c102a6 release: bump RC to 0 (-final) (fanquake) f78570e doc: mention bech32m/BIP350 in doc/descriptors.md (Pieter Wuille) Pull request description: Backports: * bitcoin#22837 - doc: mention bech32m/BIP350 in doc/descriptors.md ACKs for top commit: laanwj: ACK 6c102a6 glozow: ACK 6c102a6 looks correct to me jnewbery: ACK 6c102a6 Tree-SHA512: 8cdfee955e1abdbc6900df3d01982cb77ec57ef008b75487ac9a63d571cc21e4ae0f107849aa575d239a8662619553778955ffbebf57201de5afcd34298d57b4
2 parents 97d3500 + 6c102a6 commit af591f2

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Diff for: configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ define(_CLIENT_VERSION_MAJOR, 0)
33
define(_CLIENT_VERSION_MINOR, 21)
44
define(_CLIENT_VERSION_REVISION, 2)
55
define(_CLIENT_VERSION_BUILD, 0)
6-
define(_CLIENT_VERSION_RC, 2)
6+
define(_CLIENT_VERSION_RC, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2020)
99
define(_COPYRIGHT_HOLDERS,[The %s developers])

Diff for: doc/descriptors.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Descriptors consist of several types of expressions. The top level expression is
9191
`ADDR` expressions are any type of supported address:
9292
- P2PKH addresses (base58, of the form `1...` for mainnet or `[nm]...` for testnet). Note that P2PKH addresses in descriptors cannot be used for P2PK outputs (use the `pk` function instead).
9393
- P2SH addresses (base58, of the form `3...` for mainnet or `2...` for testnet, defined in [BIP 13](https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki)).
94-
- Segwit addresses (bech32, of the form `bc1...` for mainnet or `tb1...` for testnet, defined in [BIP 173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki)).
94+
- Segwit addresses (bech32 and bech32m, of the form `bc1...` for mainnet or `tb1...` for testnet, defined in [BIP 173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki) and [BIP 350](https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki)).
9595

9696
## Explanation
9797

Diff for: doc/release-notes.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
0.21.2rc2 Release Notes
1+
0.21.2 Release Notes
22
====================
33

4-
Bitcoin Core version 0.21.2rc2 is now available from:
4+
Bitcoin Core version 0.21.2 is now available from:
55

6-
<https://bitcoincore.org/bin/bitcoin-core-0.21.2/test.rc2/>
6+
<https://bitcoincore.org/bin/bitcoin-core-0.21.2/>
77

88
This minor release includes various bug fixes and performance
99
improvements, as well as updated translations.
@@ -42,7 +42,7 @@ longer supported. Additionally, Bitcoin Core does not yet change appearance
4242
when macOS "dark mode" is activated.
4343

4444

45-
0.21.2rc2 change log
45+
0.21.2 change log
4646
=================
4747

4848
### P2P protocol and network code

0 commit comments

Comments
 (0)