nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug24526_squashed'

Browse Source
This commit is contained in:
Nick Mathewson 2018-01-11 12:33:52 -05:00
commit c349bfec36
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug24526 Normal file
View File

@ -0,0 +1,4 @@
o Documentation:
- Document that operators who run more than one relay or bridge are
expected to set MyFamily and ContactInfo correctly. Closes ticket
24526.

13
doc/tor.1.txt
View File

@ -1721,7 +1721,12 @@ is non-zero):
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.
purpose. +
+
ContactInfo **must** be set to a working address if you run more than one
relay or bridge. (Really, everybody running a relay or bridge should set
it.)
[[ExitRelay]] **ExitRelay** **0**|**1**|**auto**::
Tells Tor whether to run as an exit relay. If Tor is running as a
@ -1949,7 +1954,11 @@ is non-zero):
compromise its concealment. +
+
When listing a node, it's better to list it by fingerprint than by
nickname: fingerprints are more reliable.
nickname: fingerprints are more reliable. +
+
MyFamily **must** be set correctly if you run more than one relay or
bridge. (That is, every relay should list all the others as described
above.)
[[Nickname]] **Nickname** __name__::
Set the server's nickname to \'name'. Nicknames must be between 1 and 19

6
src/config/torrc.minimal.in-staging
View File

@ -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.

6
src/config/torrc.sample.in
View File

@ -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.