Document default value for Nickname

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 34ec866b138e3647b9a0cbc93e550736a5b0ba8f..03a8734f7f1f7acd8bc73a7a3708fcc6deb51c94 100644 (file)
--- 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 90f91e5cb9d623fdcb124bef0c332ec728cbe1e4..86429f117677e805008a9a0ac061a2494fcc1dc3 100644 (file)
--- 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 4e183478eb8a15e74b5a3f180f0e47f1c97d8073..72cca0be31ba442b819afdc15a825bb6f728a880 100644 (file)
--- 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