[or-cvs] Remove need for dirservers file: now, we note trusted dirse...

[Nick Mathewson]

Update of /home/or/cvsroot/src/config
In directory moria.mit.edu:/tmp/cvs-serv21434/src/config

Modified Files:
	Makefile.am torrc.sample.in 
Log Message:
Remove need for dirservers file: now, we note trusted dirservers in configuration options, and only need to remember addr:port and key digest for each one.

Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/src/config/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	30 Mar 2004 00:01:03 -0000	1.4
+++ Makefile.am	14 Oct 2004 01:44:32 -0000	1.5
@@ -1,5 +1,5 @@
 confdir = $(sysconfdir)/tor
 
-EXTRA_DIST = dirservers
+EXTRA_DIST = 
 
-conf_DATA = dirservers torrc.sample
+conf_DATA = torrc.sample

Index: torrc.sample.in
===================================================================
RCS file: /home/or/cvsroot/src/config/torrc.sample.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- torrc.sample.in	3 Oct 2004 19:37:48 -0000	1.20
+++ torrc.sample.in	14 Oct 2004 01:44:32 -0000	1.21
@@ -1,9 +1,5 @@
 # Configuration file for a typical tor user
 
-# List of routers. Tor nodes start out knowing about the directory
-# servers, and from them they get a list of currently up nodes.
-RouterFile @CONFDIR@/dirservers
-
 # Replace this with "SocksPort 0" if you don't want clients to connect.
 SocksPort 9050
 SocksBindAddress 127.0.0.1 # accept connections only from localhost
@@ -37,6 +33,14 @@
 # Uncomment this to start the process in the background
 #RunAsDaemon 1
 
+# The three trusted directory servers on the current Tor network.  The entries
+# below are for moria1, moria2, and tor26 respectively.  Tor only trusts 
+# directories signed with one of these three keys, and uses the given addresses
+# to conntect to the trusted directory servers.
+DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
+DirServer 18.244.0.188:9032 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
+DirServer 62.116.124.106:9030 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
+
 ##################### Below is just for servers #####################
 
 ## NOTE: If you enable these, you should consider mailing your