aboutsummaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-10-09 12:02:53 -0400
committerNick Mathewson <nickm@torproject.org>2013-10-09 12:02:53 -0400
commit73a0bb16b9b750be9a51470ff57ee654787836d9 (patch)
tree021a7eea809f6546c6405fa99805113ac3722189 /src/config
parent270dcc9131668c914c8a59e615c786ca2f4fb334 (diff)
downloadtor-73a0bb16b9b750be9a51470ff57ee654787836d9.tar
tor-73a0bb16b9b750be9a51470ff57ee654787836d9.tar.gz
Partially revert "Clarify who learns about ContactInfo."
This reverts the torrc.sample.in changes from commit 66a04a6ac334775dc396025e0c15fa49eca138a7. We're going to not make this change in 0.2.4, since changing torrc.sample.in makes all the debian users do some pointless busywork. see tor-dev discusion of 9 Oct 2013.
Diffstat (limited to 'src/config')
-rw-r--r--src/config/torrc.sample.in9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 78013c2f1..c667efc5c 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -120,12 +120,9 @@
## is per month)
#AccountingStart month 3 15:00
-## 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.
+## 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.
#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>