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 /src | |
| parent | a1a32b483412deda5b7573c3120c85fe41e3dfd2 (diff) | |
| parent | 0c7740b7ded0eb26aca45a4b96d74a9293660edd (diff) | |
| download | tor-2c5841a8b855b6340952a10b6014ec6cdd44ca87.tar.gz tor-2c5841a8b855b6340952a10b6014ec6cdd44ca87.zip | |
Merge remote-tracking branch 'saper/default_nickname'
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/torrc.minimal.in-staging | 2 | ||||
| -rw-r--r-- | src/config/torrc.sample.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 90f91e5cb9..86429f1176 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 4e183478eb..72cca0be31 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 |