aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-07-10 13:53:10 +0200
committerMarcoFalke <falke.marco@gmail.com>2020-07-10 13:53:54 +0200
commit888886ed5b72621872af23e141ab51f59661c139 (patch)
tree581a4fa3375ba74b71d8477a4a7f0aca92636439
parentfa3998859885fa75039ad72e0b7746d7d349b7d1 (diff)
downloadbitcoin-888886ed5b72621872af23e141ab51f59661c139.tar.xz
doc: move-only release notes for 0.20.1
-rw-r--r--doc/release-notes-18982.md8
-rw-r--r--doc/release-notes-19219.md23
-rw-r--r--doc/release-notes.md34
3 files changed, 34 insertions, 31 deletions
diff --git a/doc/release-notes-18982.md b/doc/release-notes-18982.md
deleted file mode 100644
index d1b8528d13..0000000000
--- a/doc/release-notes-18982.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Notification changes
---------------------
-
-`-walletnotify` notifications are now sent for wallet transactions that are
-removed from the mempool because they conflict with a new block. These
-notifications were sent previously before the v0.19 release, but had been
-broken since that release (bug
-[#18325](https://github.com/bitcoin/bitcoin/issues/18325)).
diff --git a/doc/release-notes-19219.md b/doc/release-notes-19219.md
deleted file mode 100644
index b5ee885ddc..0000000000
--- a/doc/release-notes-19219.md
+++ /dev/null
@@ -1,23 +0,0 @@
-#### Changes regarding misbehaving peers
-
-Peers that misbehave (e.g. send us invalid blocks) are now referred to as
-discouraged nodes in log output, as they're not (and weren't) strictly banned:
-incoming connections are still allowed from them, but they're preferred for
-eviction.
-
-Furthermore, a few additional changes are introduced to how discouraged
-addresses are treated:
-
-- Discouraging an address does not time out automatically after 24 hours
- (or the `-bantime` setting). Depending on traffic from other peers,
- discouragement may time out at an indeterminate time.
-
-- Discouragement is not persisted over restarts.
-
-- There is no method to list discouraged addresses. They are not returned by
- the `listbanned` RPC. That RPC also no longer reports the `ban_reason`
- field, as `"manually added"` is the only remaining option.
-
-- Discouragement cannot be removed with the `setban remove` RPC command.
- If you need to remove a discouragement, you can remove all discouragements by
- stop-starting your node.
diff --git a/doc/release-notes.md b/doc/release-notes.md
index b8313abe68..6f2e61ce68 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -58,6 +58,40 @@ this release:
Notable changes
===============
+Changes regarding misbehaving peers
+-----------------------------------
+
+Peers that misbehave (e.g. send us invalid blocks) are now referred to as
+discouraged nodes in log output, as they're not (and weren't) strictly banned:
+incoming connections are still allowed from them, but they're preferred for
+eviction.
+
+Furthermore, a few additional changes are introduced to how discouraged
+addresses are treated:
+
+- Discouraging an address does not time out automatically after 24 hours
+ (or the `-bantime` setting). Depending on traffic from other peers,
+ discouragement may time out at an indeterminate time.
+
+- Discouragement is not persisted over restarts.
+
+- There is no method to list discouraged addresses. They are not returned by
+ the `listbanned` RPC. That RPC also no longer reports the `ban_reason`
+ field, as `"manually added"` is the only remaining option.
+
+- Discouragement cannot be removed with the `setban remove` RPC command.
+ If you need to remove a discouragement, you can remove all discouragements by
+ stop-starting your node.
+
+Notification changes
+--------------------
+
+`-walletnotify` notifications are now sent for wallet transactions that are
+removed from the mempool because they conflict with a new block. These
+notifications were sent previously before the v0.19 release, but had been
+broken since that release (bug
+[#18325](https://github.com/bitcoin/bitcoin/issues/18325)).
+
0.20.1 change log
=================