commit 0c7740b7ded0eb26aca45a4b96d74a9293660edd Author: Marcin Cieślak saper@saper.info Date: Sun Apr 29 13:00:32 2018 +0000
Document default value for Nickname --- doc/tor.1.txt | 2 ++ src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 34ec866b1..03a8734f7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2061,6 +2061,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 diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 90f91e5cb..86429f117 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -100,7 +100,7 @@ ## A handle for your relay, so people don't have to refer to it by key. ## Nicknames must be between 1 and 19 characters inclusive, and must ## contain only the alphanumeric characters (a-z, A-Z, 0-9). No unicode, -## no emoji. +## no emoji. If not set, "Unnamed" will be used. #Nickname ididnteditheconfig
## Define these to limit how much relayed traffic you will allow. Your diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 4e183478e..72cca0be3 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -106,6 +106,7 @@ ## A handle for your relay, so people don't have to refer to it by key. ## 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. #Nickname ididnteditheconfig
## Define these to limit how much relayed traffic you will allow. Your