Skip to content

Commit

Permalink
Merge bitcoin#22858: [0.21] Final changes for 0.21.2
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fanquake committed Sep 23, 2021
2 parents 97d3500 + 6c102a6 commit af591f2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 21)
define(_CLIENT_VERSION_REVISION, 2)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 2)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2020)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
2 changes: 1 addition & 1 deletion doc/descriptors.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Descriptors consist of several types of expressions. The top level expression is
`ADDR` expressions are any type of supported address:
- 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).
- 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)).
- 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)).
- 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)).

## Explanation

Expand Down
8 changes: 4 additions & 4 deletions doc/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
0.21.2rc2 Release Notes
0.21.2 Release Notes
====================

Bitcoin Core version 0.21.2rc2 is now available from:
Bitcoin Core version 0.21.2 is now available from:

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

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


0.21.2rc2 change log
0.21.2 change log
=================

### P2P protocol and network code
Expand Down

0 comments on commit af591f2

Please sign in to comment.