aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-09-13 12:36:55 -0400
committerNick Mathewson <nickm@torproject.org>2013-09-13 12:36:55 -0400
commite35c972851686b5f6f2181e4eddb592f07fd7587 (patch)
tree359d389cf71396cc8d7a640fc18b89eb87134489 /doc
parente0b2cd061bd62fc790d434b2da7ecc51ed100904 (diff)
parentbf5e1e19f7c65845543001a18b8277c7a906814c (diff)
downloadtor-e35c972851686b5f6f2181e4eddb592f07fd7587.tar
tor-e35c972851686b5f6f2181e4eddb592f07fd7587.tar.gz
Merge branch 'bug4647_squashed'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 737e7b4f8..a1e1c08ba 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -46,7 +46,7 @@ COMMAND-LINE OPTIONS
configuration file, and by those on the command line. (Default:
@CONFDIR@/torrc-defaults.)
-**--hash-password**::
+**--hash-password** __PASSWORD__::
Generates a hashed password for control port access.
**--list-fingerprint**::