Merge remote-tracking branch 'origin/maint-0.2.4'

This commit is contained in:
Nick Mathewson
2013-10-09 09:45:21 -04:00
3 changed files with 16 additions and 6 deletions
+7 -3
View File
@@ -1402,9 +1402,13 @@ is non-zero):
descriptor to the public directory authorities.
[[ContactInfo]] **ContactInfo** __email_address__::
Administrative contact information for server. This line might get picked
up by spam harvesters, so you may want to obscure the fact that it's an
email address.
Administrative contact information for this relay or bridge. This line
can be used to contact you if your relay or bridge is misconfigured or
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__,__...__::
Set an exit policy for this server. Each policy is of the form