From d0c596e91d235248e7304a23ab8d4b23f3dabc92 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 14 Dec 2020 18:25:20 +0100
Subject: [PATCH] merge bitcoin#20653: Move addr relay comment in net to
 correct place

comment was moved to net.h in 678df631 (#4888) and removed entirely in
796353ad (#5771). the comment is being restored back to where it is
upstream, in CNode::RelayAddrsWithConn.
---
 src/net.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/net.h b/src/net.h
index 9f486a49ad..67e5e93cf7 100644
--- a/src/net.h
+++ b/src/net.h
@@ -568,6 +568,9 @@ public:
     /* Whether we send addr messages over this connection */
     bool RelayAddrsWithConn() const
     {
+        // Don't relay addr messages to peers that we connect to as block-relay-only
+        // peers (to prevent adversaries from inferring these links from addr
+        // traffic).
         return m_conn_type != ConnectionType::BLOCK_RELAY;
     }