diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-04-15 14:38:21 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-04-15 14:38:39 +0200 |
| commit | 9422e2c29fbcd2fd9c197f7da0d9469d7a938757 (patch) | |
| tree | dda92a0c08ecb06238555479eb1dc9da9668170d | |
| parent | 0c6487c74f8c5ba6de5e4aad44c89be5fbdbe942 (diff) | |
| parent | 140bbeec45f14fd50cce68448bc7fa655cbef951 (diff) | |
Merge #15792: doc: describe onlynet option in doc/tor.md
140bbeec45f14fd50cce68448bc7fa655cbef951 doc: describe onlynet option in doc/tor.md (Jon Atack)
Pull request description:
as per http://www.erisian.com.au/bitcoin-core-dev/log-2019-04-11.html#l-102.
Description adapted from [/src/init.cpp#L429](https://github.com/bitcoin/bitcoin/blob/master/src/init.cpp#L429).
Please verify if this is the best place to add it in the documentation.
This commit also fixes a typo in doc/dependencies.md.
[skip ci]
ACKs for commit 140bbe:
practicalswift:
ACK 140bbeec45f14fd50cce68448bc7fa655cbef951
fanquake:
utACK 140bbee
Tree-SHA512: 05064cc155de5a855e26f70ac5741a137ee5050573007a19e10dba0b5b2c89148ef30f765b50fc76f73dfad17df082f4e68e174b93e2bf7e169e8bd1f9426673
| -rw-r--r-- | doc/dependencies.md | 2 | ||||
| -rw-r--r-- | doc/tor.md | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/dependencies.md b/doc/dependencies.md index c445e2e23f..1b3df62867 100644 --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -43,4 +43,4 @@ Some dependencies are not needed in all configurations. The following are some f * ZeroMQ is needed only with the `--with-zmq` option. #### Other -* librsvg is only needed if you need to run `make deploy` on (cross-compliation to) macOS. +* librsvg is only needed if you need to run `make deploy` on (cross-compilation to) macOS. diff --git a/doc/tor.md b/doc/tor.md index c46b7e9f60..cfb7f16666 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -16,7 +16,7 @@ outgoing connections, but more is possible. -onion=ip:port Set the proxy server to use for Tor hidden services. You do not need to set this if it's the same as -proxy. You can use -noonion - to explicitly disable access to hidden service. + to explicitly disable access to hidden services. -listen When using -proxy, listening is disabled by default. If you want to run a hidden service (see next section), you'll need to enable @@ -27,6 +27,11 @@ outgoing connections, but more is possible. -seednode=X SOCKS5. In Tor mode, such addresses can also be exchanged with other P2P nodes. + -onlynet=onion Make outgoing connections only to .onion addresses. Incoming + connections are not affected by this option. This option can be + specified multiple times to allow multiple network types, e.g. + ipv4, ipv6, or onion. + In a typical situation, this suffices to run behind a Tor proxy: ./bitcoind -proxy=127.0.0.1:9050 |