aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-10-19 12:10:02 +0200
committerMarcoFalke <falke.marco@gmail.com>2020-10-19 12:00:16 +0200
commitfa38093beec89db97be9c61b78f3c5de127edbc8 (patch)
tree529a5a7219f0b82ff03f79210814e8647c7ae0dc
parent4769942d901a6095dc8715b6008d608e62d10b3c (diff)
doc: Merge release notes
-rw-r--r--doc/release-notes-19988.md9
-rw-r--r--doc/release-notes.md8
2 files changed, 8 insertions, 9 deletions
diff --git a/doc/release-notes-19988.md b/doc/release-notes-19988.md
deleted file mode 100644
index ef26eb3032..0000000000
--- a/doc/release-notes-19988.md
+++ /dev/null
@@ -1,9 +0,0 @@
-P2P changes
------------
-
-The size of the set of transactions that peers have announced and we consider
-for requests has been reduced from 100000 to 5000 (per peer), and further
-announcements will be ignored when that limit is reached. If you need to
-dump (very) large batches of transactions, exceptions can be made for trusted
-peers using the "relay" network permission. For localhost for example it can
-be enabled using the command line option `-whitelist=relay@127.0.0.1`.
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 65726f3d5d..4c69c61390 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -82,6 +82,14 @@ P2P and network changes
node using P2P relay. This version reduces the initial broadcast guarantees
for wallet transactions submitted via P2P to a node running the wallet. (#18038)
+- The size of the set of transactions that peers have announced and we consider
+ for requests has been reduced from 100000 to 5000 (per peer), and further
+ announcements will be ignored when that limit is reached. If you need to dump
+ (very) large batches of transactions, exceptions can be made for trusted
+ peers using the "relay" network permission. For localhost for example it can
+ be enabled using the command line option `-whitelist=relay@127.0.0.1`.
+ (#19988)
+
- The Tor onion service that is automatically created by setting the
`-listenonion` configuration parameter will now be created as a Tor v3 service
instead of Tor v2. The private key that was used for Tor v2 (if any) will be