diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-07 13:31:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-07 13:31:03 -0400 |
| commit | 2c5841a8b855b6340952a10b6014ec6cdd44ca87 (patch) | |
| tree | 57c2e776b0bf2510418932866b223908064c5033 /doc | |
| parent | a1a32b483412deda5b7573c3120c85fe41e3dfd2 (diff) | |
| parent | 0c7740b7ded0eb26aca45a4b96d74a9293660edd (diff) | |
| download | tor-2c5841a8b855b6340952a10b6014ec6cdd44ca87.tar.gz tor-2c5841a8b855b6340952a10b6014ec6cdd44ca87.zip | |
Merge remote-tracking branch 'saper/default_nickname'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4d22c2e61e..dc0eaba283 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2065,6 +2065,8 @@ is non-zero): [[Nickname]] **Nickname** __name__:: Set the server's nickname to \'name'. Nicknames must be between 1 and 19 characters inclusive, and must contain only the characters [a-zA-Z0-9]. + If not set, **Unnamed** will be used. Relays can always be uniquely identified + by their identity fingerprints. [[NumCPUs]] **NumCPUs** __num__:: How many processes to use at once for decrypting onionskins and other |