aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2018-12-04 11:30:14 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2018-12-04 11:30:30 +0100
commit8f1753b298f143502951c17d3179ed4742e9d1e6 (patch)
treec66f5c9f6e81665c170fbc05173879e9b5f91c74
parent0257062e50ca223b4a097ebfdbe1efabbd361d76 (diff)
parent6c6ee8af80cdd6bc3b677b95209b0700f08a2c98 (diff)
Merge #14804: docs: Less confusing documentation for `torpassword`
6c6ee8af8 Less confusing documentation for `torpassword` (Chakib Benziane) Pull request description: Rebased & squashed #14609. > The current documentation leads the reader to think hash-password is an other option. This change is less confusing and make it clear how to use this option. Tree-SHA512: b94223715f1d28a8218e501117faa103d7cc791333e6d9a40e9253756070316d41de73e3b4593cd1fa9e1823fa8e8de4938cf0de89117a6e4649401d877e3477
-rw-r--r--doc/tor.md10
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/tor.md b/doc/tor.md
index dc0b88618a..c46b7e9f60 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -109,9 +109,13 @@ preconfigured and the creation of a hidden service is automatic. If permission p
are seen with `-debug=tor` they can be resolved by adding both the user running Tor and
the user running bitcoind to the same group and setting permissions appropriately. On
Debian-based systems the user running bitcoind can be added to the debian-tor group,
-which has the appropriate permissions. An alternative authentication method is the use
-of the `-torpassword` flag and a `hash-password` which can be enabled and specified in
-Tor configuration.
+which has the appropriate permissions.
+
+An alternative authentication method is the use
+of the `-torpassword=password` option. The `password` is the clear text form that
+was used when generating the hashed password for the `HashedControlPassword` option
+in the tor configuration file. The hashed password can be obtained with the command
+`tor --hash-password password` (read the tor manual for more details).
## 4. Privacy recommendations