summaryrefslogtreecommitdiff
path: root/src/config/torrc.sample.in
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-20 11:10:14 -0500
committerNick Mathewson <nickm@torproject.org>2018-01-11 12:33:30 -0500
commitac0f819ce5d584c10ce83b35e10fb1a85643782f (patch)
tree187f4d8dd9247437e2403b5bcb2d701eea57baa3 /src/config/torrc.sample.in
parentc99ec36defadf763034b82107f6168987668862f (diff)
downloadtor-ac0f819ce5d584c10ce83b35e10fb1a85643782f.tar.gz
tor-ac0f819ce5d584c10ce83b35e10fb1a85643782f.zip
Note contactinfo and myfamily as required in more places
Includes a sentence from cypherpunks; for ticket 24526.
Diffstat (limited to 'src/config/torrc.sample.in')
-rw-r--r--src/config/torrc.sample.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 8f3597f3f6..8923d4602f 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -135,6 +135,9 @@
## descriptors containing these lines and that Google indexes them, so
## spammers might also collect them. You may want to obscure the fact that
## it's an email address and/or generate a new address for this purpose.
+##
+## If you are running multiple relays, you MUST set this option.
+##
#ContactInfo Random Person <nobody AT example dot com>
## You might also include your PGP or GPG fingerprint if you have one:
#ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>
@@ -161,6 +164,9 @@
## https://www.torproject.org/docs/faq#MultipleRelays
## However, you should never include a bridge's fingerprint here, as it would
## break its concealability and potentially reveal its IP/TCP address.
+##
+## If you are running multiple relays, you MUST set this option.
+##
#MyFamily $keyid,$keyid,...
## A comma-separated list of exit policies. They're considered first