aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorW. J. van der Laan <laanwj@protonmail.com>2021-06-12 12:22:49 +0200
committerW. J. van der Laan <laanwj@protonmail.com>2021-06-12 12:23:17 +0200
commit4bff49bbb1d49f0775076a308cf45d1e7a225273 (patch)
treeda14e84e64948a44da224052b06a61a2f1b37e6b
parent96f828ba4d69f8acadf335ee79fa8f06cd33c0a6 (diff)
parent2ad034a89095bc1b148bdeeacfa5b75ec23b8a21 (diff)
downloadbitcoin-4bff49bbb1d49f0775076a308cf45d1e7a225273.tar.xz
Merge bitcoin/bitcoin#22172: doc: update tor.md, release notes with removal of tor v2 support
2ad034a89095bc1b148bdeeacfa5b75ec23b8a21 doc: update release notes with removal of tor v2 support (Jon Atack) 49938eee9c338cd96e357a0dd51dcce934ceb212 doc: update tor.md with removal of tor v2 support (Jon Atack) Pull request description: Follow-up documentation to #22050 that removed support for Tor version 2 hidden services from Bitcoin Core. ACKs for top commit: laanwj: ACK 2ad034a89095bc1b148bdeeacfa5b75ec23b8a21 Tree-SHA512: 0f13f9d1db7e11f1e3d9967b6d17b8dc3144b3ab3a258c706464c5e6ac5cbcf2ce2db4ea54be9939f05a82ebd1e7f325f50b435f9822c08b4f21ed4ac58de0af
-rw-r--r--doc/release-notes.md11
-rw-r--r--doc/tor.md10
2 files changed, 18 insertions, 3 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 53106c9f82..cb7adde470 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -59,6 +59,13 @@ Notable changes
P2P and network changes
-----------------------
+- This release removes support for Tor version 2 hidden services in favor of Tor
+ v3 only, as the Tor network [dropped support for Tor
+ v2](https://blog.torproject.org/v2-deprecation-timeline) with the release of
+ Tor version 0.4.6. Henceforth, Bitcoin Core ignores Tor v2 addresses; it
+ neither rumors them over the network to other peers, nor stores them in memory
+ or to `peers.dat`. (#22050)
+
- Added NAT-PMP port mapping support via
[`libnatpmp`](https://miniupnp.tuxfamily.org/libnatpmp.html). (#18077)
@@ -142,8 +149,8 @@ Tools and Utilities
- A new CLI `-addrinfo` command returns the number of addresses known to the
node per network type (including Tor v2 versus v3) and total. This can be
useful to see if the node knows enough addresses in a network to use options
- like `-onlynet=<network>` or to upgrade to current and future Tor releases
- that support Tor v3 addresses only. (#21595)
+ like `-onlynet=<network>` or to upgrade to this release of Bitcoin Core 22.0
+ that supports Tor v3 only. (#21595)
Wallet
------
diff --git a/doc/tor.md b/doc/tor.md
index 2640a6109b..7d134b64e0 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -5,6 +5,14 @@ It is possible to run Bitcoin Core as a Tor onion service, and connect to such s
The following directions assume you have a Tor proxy running on port 9050. Many distributions default to having a SOCKS proxy listening on port 9050, but others may not. In particular, the Tor Browser Bundle defaults to listening on port 9150. See [Tor Project FAQ:TBBSocksPort](https://www.torproject.org/docs/faq.html.en#TBBSocksPort) for how to properly
configure Tor.
+## Compatibility
+
+- Starting with version 22.0, Bitcoin Core only supports Tor version 3 hidden
+ services (Tor v3). Tor v2 addresses are ignored by Bitcoin Core and neither
+ relayed nor stored.
+
+- Tor removed v2 support beginning with version 0.4.6.
+
## How to see information about your Tor configuration via Bitcoin Core
There are several ways to see your local onion address in Bitcoin Core:
@@ -18,7 +26,7 @@ information in the debug log about your Tor configuration.
CLI `-addrinfo` returns the number of addresses known to your node per network
type, including Tor v2 and v3. This is useful to see how many onion addresses
are known to your node for `-onlynet=onion` and how many Tor v3 addresses it
-knows when upgrading to current and future Tor releases that support Tor v3 only.
+knows when upgrading to Bitcoin Core v22.0 and up that supports Tor v3 only.
## 1. Run Bitcoin Core behind a Tor proxy