summaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-04-07 10:54:53 -0400
committerNick Mathewson <nickm@torproject.org>2016-04-07 10:54:53 -0400
commit7532cd439bc7d95a7c38b3c72bed0b3e46a26fa2 (patch)
tree18408ee1638ee7966ad9624b8b545754fb825949 /src/config
parente7034847225b1ca39dfb122e04006728d31f8db6 (diff)
downloadtor-7532cd439bc7d95a7c38b3c72bed0b3e46a26fa2.tar.gz
tor-7532cd439bc7d95a7c38b3c72bed0b3e46a26fa2.zip
When we get a bad nickname, explain what a good one is.
Closes #18300; patch from "icanhasaccount".
Diffstat (limited to 'src/config')
-rw-r--r--src/config/torrc.minimal.in-staging2
-rw-r--r--src/config/torrc.sample.in2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging
index 248cb5cf02..d4dfd5f6bb 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -98,6 +98,8 @@
# OutboundBindAddress 10.0.0.5
## 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].
#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 248cb5cf02..d4dfd5f6bb 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -98,6 +98,8 @@
# OutboundBindAddress 10.0.0.5
## 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].
#Nickname ididnteditheconfig
## Define these to limit how much relayed traffic you will allow. Your