aboutsummaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-10-04 21:21:09 +0000
committerNick Mathewson <nickm@torproject.org>2005-10-04 21:21:09 +0000
commit2d203fdcf319b45477bdcad7e3476ac3c45ee7e0 (patch)
tree77e9ae8a63c4ad69a1782a8d4c6798b125817743 /src/config
parentb10df0d5950c28f8e4684014a4f6d02d51b61f74 (diff)
downloadtor-2d203fdcf319b45477bdcad7e3476ac3c45ee7e0.tar
tor-2d203fdcf319b45477bdcad7e3476ac3c45ee7e0.tar.gz
link nicknames to trusted directory servers; log these nicknames when mentioning servers; also, when we get a naming conflict; log which nicknames or keys are supposed to bind.
svn:r5184
Diffstat (limited to 'src/config')
-rw-r--r--src/config/torrc.complete.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/config/torrc.complete.in b/src/config/torrc.complete.in
index c382f95d3..10acb0a25 100644
--- a/src/config/torrc.complete.in
+++ b/src/config/torrc.complete.in
@@ -77,9 +77,9 @@
## uncommenting these lines is a bad idea. They are the defaults now,
## but the defaults may change in the future, leaving you behind.
##
-#DirServer v1 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
-#DirServer v1 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
-#DirServer v1 86.59.5.130:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
+#DirServer moria1 v1 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
+#DirServer moria2 v1 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
+#DirServer tor26 v1 86.59.5.130:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
## On startup, setgid to this user.
#Group GID