diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-10-14 01:44:32 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-10-14 01:44:32 +0000 |
| commit | 0d5a847f12724d1a86898ca3246850c06ceaebf1 (patch) | |
| tree | 69b36dff2fd5411525ff0f99540c3b4268058255 /src/config | |
| parent | 55634e4eec5924985d74c8590b6a8c7291988e9c (diff) | |
| download | tor-0d5a847f12724d1a86898ca3246850c06ceaebf1.tar tor-0d5a847f12724d1a86898ca3246850c06ceaebf1.tar.gz | |
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.
svn:r2479
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/Makefile.am | 4 | ||||
| -rw-r--r-- | src/config/torrc.sample.in | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/config/Makefile.am b/src/config/Makefile.am index 13ed39d7f..b440abc5c 100644 --- a/src/config/Makefile.am +++ b/src/config/Makefile.am @@ -1,5 +1,5 @@ confdir = $(sysconfdir)/tor -EXTRA_DIST = dirservers +EXTRA_DIST = -conf_DATA = dirservers torrc.sample +conf_DATA = torrc.sample diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 4d562f15a..0c5fa068a 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -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 @@ AllowUnverifiedNodes middle,rendezvous # 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 |