diff options
| author | fanquake <fanquake@gmail.com> | 2022-09-13 12:36:22 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-09-13 12:36:29 +0100 |
| commit | 94d17845d04e71e189c59d65b8bbc3df1efbc59a (patch) | |
| tree | 02e42669e3aef10e9970f92e40de223493ec070c /src/index | |
| parent | a361c6cae766fd73cbc8b06ad5dbef729ca8c86d (diff) | |
| parent | 2d0b4e4ff66e60c85f86c526a53f8fb242ebb7d0 (diff) | |
| download | bitcoin-94d17845d04e71e189c59d65b8bbc3df1efbc59a.tar.xz | |
Merge bitcoin/bitcoin#24991: init: allow startup with -onlynet=onion -listenonion=1
2d0b4e4ff66e60c85f86c526a53f8fb242ebb7d0 init: allow startup with -onlynet=onion -listenonion=1 (Vasil Dimov)
Pull request description:
It does not make sense to specify `-onlynet=onion` without providing a
Tor proxy (even if other `-onlynet=...` are given). This is checked
during startup. However, it was forgotten that a Tor proxy can also be
retrieved from "Tor control" to which we connect if `-listenonion=1`.
So, the full Tor proxy retrieval logic is:
1. get it from `-onion`
2. get it from `-proxy`
3. if `-listenonion=1`, then connect to "Tor control" and get the proxy
from there (was forgotten before this change)
Fixes https://github.com/bitcoin/bitcoin/issues/24980
ACKs for top commit:
mzumsande:
Tested ACK 2d0b4e4ff66e60c85f86c526a53f8fb242ebb7d0
MarcoFalke:
ACK 2d0b4e4ff66e60c85f86c526a53f8fb242ebb7d0 🕸
Tree-SHA512: d1d18e07a8a40a47b7f00c31cb291a3d3a9b24eeb28c5e4720d5df4997f488583a3a010d46902b4b600d2ed1136a368e1051c133847ae165e0748b8167603dc3
Diffstat (limited to 'src/index')
0 files changed, 0 insertions, 0 deletions