diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-20 11:10:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-11 20:00:18 -0500 |
| commit | 4c651b8c0414f1de5db87e9255b80f401a63263e (patch) | |
| tree | bc099684229217a8bd8b4727961e4fca36af6a41 /src/config | |
| parent | 34c6034aa73172347b5d2ea97b6d63c64f8b82d6 (diff) | |
| download | tor-4c651b8c0414f1de5db87e9255b80f401a63263e.tar.gz tor-4c651b8c0414f1de5db87e9255b80f401a63263e.zip | |
Note contactinfo and myfamily as required in more places
Includes a sentence from cypherpunks; for ticket 24526.
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/torrc.minimal.in-staging | 6 | ||||
| -rw-r--r-- | src/config/torrc.sample.in | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 4fede6dcf5..90f91e5cb9 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -132,6 +132,9 @@ ## 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. ## Notice that "<" and ">" are recommended. +## +## 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. ## Use the full fingerprint, not just a (short) KeyID: KeyIDs are easy @@ -161,6 +164,9 @@ ## See 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,... ## Uncomment this if you want your relay to allow IPv6 exit traffic. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 865e9f6606..4e183478eb 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -136,6 +136,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> @@ -162,6 +165,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,... ## Uncomment this if you do *not* want your relay to allow any exit traffic. |