diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-28 11:53:03 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-28 11:53:03 -0500 |
| commit | a5bed4dab2f8521f744d5137e4f439b073c7e5e9 (patch) | |
| tree | fbca7f263d6b2ad68bcd4f1e735a8de12bd9d4c0 /doc | |
| parent | 6b2087dbe42e2e4a81b5cac9278f81a97f80a1cb (diff) | |
| parent | 601c82325549c00fb6d3c507c87b3224de44fa3f (diff) | |
| download | tor-a5bed4dab2f8521f744d5137e4f439b073c7e5e9.tar.gz tor-a5bed4dab2f8521f744d5137e4f439b073c7e5e9.zip | |
Merge branch 'maint-0.2.7'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9d5bfdc654..d08366aa55 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,8 +95,7 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. -[[opt-keygen]] **--keygen** [**--newpass**] - +[[opt-keygen]] **--keygen** [**--newpass**]:: Running "tor --keygen" creates a new ed25519 master identity key for a relay, or only a fresh temporary signing key and certificate, if you already have a master key. Optionally you can encrypt the master identity |