Merge remote-tracking branch 'saper/default_nickname'
This commit is contained in:
commit
2c5841a8b8
|
@ -2065,6 +2065,8 @@ is non-zero):
|
||||||
[[Nickname]] **Nickname** __name__::
|
[[Nickname]] **Nickname** __name__::
|
||||||
Set the server's nickname to \'name'. Nicknames must be between 1 and 19
|
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].
|
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__::
|
[[NumCPUs]] **NumCPUs** __num__::
|
||||||
How many processes to use at once for decrypting onionskins and other
|
How many processes to use at once for decrypting onionskins and other
|
||||||
|
|
|
@ -100,7 +100,7 @@
|
||||||
## A handle for your relay, so people don't have to refer to it by key.
|
## 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
|
## Nicknames must be between 1 and 19 characters inclusive, and must
|
||||||
## contain only the alphanumeric characters (a-z, A-Z, 0-9). No unicode,
|
## 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
|
#Nickname ididnteditheconfig
|
||||||
|
|
||||||
## Define these to limit how much relayed traffic you will allow. Your
|
## Define these to limit how much relayed traffic you will allow. Your
|
||||||
|
|
|
@ -106,6 +106,7 @@
|
||||||
## A handle for your relay, so people don't have to refer to it by key.
|
## 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
|
## Nicknames must be between 1 and 19 characters inclusive, and must
|
||||||
## contain only the characters [a-zA-Z0-9].
|
## contain only the characters [a-zA-Z0-9].
|
||||||
|
## If not set, "Unnamed" will be used.
|
||||||
#Nickname ididnteditheconfig
|
#Nickname ididnteditheconfig
|
||||||
|
|
||||||
## Define these to limit how much relayed traffic you will allow. Your
|
## Define these to limit how much relayed traffic you will allow. Your
|
||||||
|
|
Loading…
Reference in New Issue