aboutsummaryrefslogtreecommitdiff
path: root/share/examples
diff options
context:
space:
mode:
authorW. J. van der Laan <laanwj@protonmail.com>2021-05-05 16:10:21 +0200
committerW. J. van der Laan <laanwj@protonmail.com>2021-05-05 16:10:55 +0200
commit54617fad9988eb3fb7da5203e897ec71416f9f7e (patch)
treecb98a7c186f7af4dca63ed16f7ad720b012f00de /share/examples
parent3275c6e578b41a821a90ff33667b95d79aaf3642 (diff)
parent300234ab6698277fb261a87be72f89ef94d3697a (diff)
Merge bitcoin/bitcoin#21709: doc: update reduce-memory.md and bitcoin.conf -maxconnections info
300234ab6698277fb261a87be72f89ef94d3697a doc: update bitcoin.conf maxconnections info (Jon Atack) 926827065ffa56b75e9261f63d49b924d4bced0f doc: update reduce-memory.md peer connections info (Jon Atack) Pull request description: This patch updates the documentation in `doc/reduce-memory.md` and `share/examples/bitcoin.conf` regarding the peer connections limits and `-maxconnections` ACKs for top commit: jarolrod: re-ACK 300234ab6698277fb261a87be72f89ef94d3697a laanwj: ACK 300234ab6698277fb261a87be72f89ef94d3697a prayank23: ACK https://github.com/bitcoin/bitcoin/pull/21709/commits/300234ab6698277fb261a87be72f89ef94d3697a Tree-SHA512: 90f53626124afb50706e6a3b644bc7bb800bb7cf41ae7062c20c17b3d9bdf4a8d73b4cf188faec9113d772596f7e4bc36a4a69481cacb92cc55d5956181d0c31
Diffstat (limited to 'share/examples')
-rw-r--r--share/examples/bitcoin.conf7
1 files changed, 6 insertions, 1 deletions
diff --git a/share/examples/bitcoin.conf b/share/examples/bitcoin.conf
index 85c67c8470..318b48bf2e 100644
--- a/share/examples/bitcoin.conf
+++ b/share/examples/bitcoin.conf
@@ -63,7 +63,12 @@
# Port on which to listen for connections (default: 8333, testnet: 18333, signet: 38333, regtest: 18444)
#port=
-# Maximum number of inbound+outbound connections.
+# Maximum number of inbound + outbound connections (default: 125). This option
+# applies only if inbound connections are enabled; otherwise, the number of connections
+# will not be more than 11: 8 full-relay connections, 2 block-relay-only ones, and
+# occasionally 1 short-lived feeler or extra outbound block-relay-only connection.
+# These limits do not apply to connections added manually with the -addnode
+# configuration option or the addnode RPC, which have a separate limit of 8 connections.
#maxconnections=
#