The 0.20 branch has bugfixes that should be released. However, a tag can currently not be created because the latest merge introduced a regression and is not a bugfix (https://github.com/bitcoin/bitcoin/pull/20317#issuecomment-723754509, #20317 (comment)).
Fix that by reverting the last merge. Can be reviewed by re-doing the revert or calling git diff HEAD HEAD~2 | wc and observing an empty diff.
This reverts commit a339289c2ef9caffa1195436695a13f6e48e1bbc, reversing
changes made to b9ac31f2d29ae3e79c0f0cde5bab2d7213e6da51.
#20317 has no ACKs so far, so it can’t be merged right now. It is holding back the next minor release which has already quite a few bugfixes waiting to be shipped.
I can’t vouch whether the backport is safe or unsafe, but we’ve never delayed a bugfix release to backport a feature. Also, I think this is the first time ever that a feature was backported to a bugfix release and released before it was released in a major version.
If #20317 gets enough review to make it into the release, fine by me. Otherwise the milestone will simply be adjusted by one minor version. Also, no review will be lost. Observing and ACKing an empty diff can be done by anyone.
Code review ACK fa074d2c7b9c3d34876c428d12672a505d4ce4eb
0$ git fetch upstream pull/20399/head
1$ git checkout FETCH_HEAD
2$ git diff HEAD HEAD~2 | wc -l
30
(this doesn’t work with the merge of this PR to the branch because there was an intermediate merge of #20166 in between, but that’s okay, it still applies cleanly)