Merge branch 'maint-0.2.7'

This commit is contained in:
Nick Mathewson 2016-01-28 11:53:03 -05:00
commit a5bed4dab2

View File

@ -95,8 +95,7 @@ COMMAND-LINE OPTIONS
which tells Tor to only send warnings and errors to the console, or with 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. 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 Running "tor --keygen" creates a new ed25519 master identity key for a
relay, or only a fresh temporary signing key and certificate, if you relay, or only a fresh temporary signing key and certificate, if you
already have a master key. Optionally you can encrypt the master identity already have a master key. Optionally you can encrypt the master identity