aboutsummaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2013-10-09 12:01:45 +0200
committerNick Mathewson <nickm@torproject.org>2013-10-09 09:43:18 -0400
commit66a04a6ac334775dc396025e0c15fa49eca138a7 (patch)
treea650154b133a3af19d50682d08dc3ece2f4428a1 /src/config
parentb8abadedd3cb7ac3d140becf23d0a624e6405749 (diff)
downloadtor-66a04a6ac334775dc396025e0c15fa49eca138a7.tar
tor-66a04a6ac334775dc396025e0c15fa49eca138a7.tar.gz
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.
Diffstat (limited to 'src/config')
-rw-r--r--src/config/torrc.sample.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index c667efc5c..78013c2f1 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -120,9 +120,12 @@
## is per month)
#AccountingStart month 3 15:00
-## Contact info to be published in the directory, so we can contact you
-## if your relay is misconfigured or something else goes wrong. Google
-## indexes this, so spammers might also collect it.
+## 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.
#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>