Clarify who learns about ContactInfo.

Explicitly include bridges, and note that we archive and publish all
descriptors.

(We are not yet publishing ContactInfo lines contained in bridge
descriptors, but maybe we'll want to do that soon, so let's err on the
side of caution here.)

Related to #9854.
This commit is contained in:
Karsten Loesing 2013-10-09 12:01:45 +02:00 committed by Nick Mathewson
parent b8abadedd3
commit 66a04a6ac3
2 changed files with 13 additions and 6 deletions

View File

@ -1383,9 +1383,13 @@ is non-zero):
descriptor to the public directory authorities. descriptor to the public directory authorities.
[[ContactInfo]] **ContactInfo** __email_address__:: [[ContactInfo]] **ContactInfo** __email_address__::
Administrative contact information for server. This line might get picked Administrative contact information for this relay or bridge. This line
up by spam harvesters, so you may want to obscure the fact that it's an can be used to contact you if your relay or bridge is misconfigured or
email address. something else goes wrong. Note that we archive and publish all
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.
[[ExitPolicy]] **ExitPolicy** __policy__,__policy__,__...__:: [[ExitPolicy]] **ExitPolicy** __policy__,__policy__,__...__::
Set an exit policy for this server. Each policy is of the form Set an exit policy for this server. Each policy is of the form

View File

@ -120,9 +120,12 @@
## is per month) ## is per month)
#AccountingStart month 3 15:00 #AccountingStart month 3 15:00
## Contact info to be published in the directory, so we can contact you ## Administrative contact information for this relay or bridge. This line
## if your relay is misconfigured or something else goes wrong. Google ## can be used to contact you if your relay or bridge is misconfigured or
## indexes this, so spammers might also collect it. ## something else goes wrong. Note that we archive and publish all
## 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.
#ContactInfo Random Person <nobody AT example dot com> #ContactInfo Random Person <nobody AT example dot com>
## You might also include your PGP or GPG fingerprint if you have one: ## You might also include your PGP or GPG fingerprint if you have one:
#ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com> #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>