[or-cvs] link nicknames to trusted directory servers; log these nick...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/config
In directory moria:/tmp/cvs-serv11438/src/config

Modified Files:
	torrc.complete.in 
Log Message:
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.

Index: torrc.complete.in
===================================================================
RCS file: /home/or/cvsroot/tor/src/config/torrc.complete.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- torrc.complete.in	23 Sep 2005 20:44:22 -0000	1.2
+++ torrc.complete.in	4 Oct 2005 21:21:09 -0000	1.3
@@ -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