updated dirservers file, new config files.

svn:r524

7 files changed, 37 insertions, 142 deletions

diff --git a/src/config/dirservers b/src/config/dirservers
index e8b6fbbd3..19a82692e 100644
--- a/src/config/dirservers
+++ b/src/config/dirservers
@@ -1,7 +1,9 @@
 # This is no longer a manually-editable file. It's just a
 # concatenation of a bunch of signed router descriptors.
 
-router moria.mit.edu 9001 9021 9031 800000
+router moria1 moria.mit.edu 9001 9021 9031 800000
+platform Tor 0.0.2pre8 on Linux moria.mit.edu 2.4.18-27.7.xbigmem #1 SMP Fri Mar 14 05:08:50 EST 2003 i686
+published 2003-09-30 23:14:08
 onion-key
 -----BEGIN RSA PUBLIC KEY-----
 MIGJAoGBANoIvHieyHUTzIacbnWOnyTyzGrLOdXqbcjz2GGMxyHEd5K1bO1ZBNHP
@@ -22,12 +24,14 @@ xkhMQf5XuNFUb8UmYPSOH4WErjvYjKvU+gfjbK/82Jo9SuHpYz+BAgMBAAE=
 -----END RSA PUBLIC KEY-----
 router-signature
 -----BEGIN SIGNATURE-----
-fYcz+14lf2kilu0zGrkyAvfjNk2GfL5QClhdCiBuqy5fIkUS/969WZSWg9BXi7pK
-5+EgR9hvY4nAtJ2SBoE+lyOx7miuT/uGfH68wNkC0Le2gULcprDYFKAEc5i1o/aS
-Y/kuZIFDm2FXQPrYM88CIHAq8/3amUCskf2vC7l2eNE=
+Td3zb5d6uxO8oYGlmEHGzIdLuVm9s1Afqtm29JvRnnviQ36j6FZPlzPUaMVOUayn
+Wtz/CbaMj7mHSufpQ68wCLb1lQrtQkn7MkAWcQPIvZjpYh3UrcWrpfm7f/D+nKeN
+Z7UovF36xhCacjATNHhQNHHZHH6yONwN+Rf/N4kyPHw=
 -----END SIGNATURE-----
 
-router moria.mit.edu 9002 9022 9032 800000
+router moria2 moria.mit.edu 9002 9022 9032 800000
+platform Tor 0.0.2pre8 on Linux moria.mit.edu 2.4.18-27.7.xbigmem #1 SMP Fri Mar 14 05:08:50 EST 2003 i686
+published 2003-09-30 23:14:05
 onion-key
 -----BEGIN RSA PUBLIC KEY-----
 MIGJAoGBAM4Cc/npgYC54XrYLC+grVxJp7PDmNO2DRRJOxKttBBtvLpnR1UaueTi
@@ -48,12 +52,14 @@ nTA+fD8JQqpPtb8b0SnG9kwy75eS//sRu7TErie2PzGMxrf9LH0LAgMBAAE=
 -----END RSA PUBLIC KEY-----
 router-signature
 -----BEGIN SIGNATURE-----
-Hyx1fJFJaR9j7OpEg4qdxKo+AMXIZl6250AuiYmvdcwWD2VBJyhSbptB/vMLQGrU
-/PGWLlZus90xD/mKesc4b0CkwKD6eWI90Wn34JwBUGHalN/qm42tMMoq3slOWae0
-Da9JmxiYqApXwwaHWR9WwNHmkXkWfvTmZDSFkdEMgV0=
+X10a9Oc0LKNYKLDVzjRTIVT3NnE0y+xncllDDHSJSXR97fz3MBHGDqhy0Vgha/fe
+H/Y2E59oG01lYQ73j3JN+ibsCMtkzJDx2agCpV0LmakAD9ekHrYDWm/S41Ru6kf+
+PsyHpXlh7cZuGEX4U1pblSDFrQZ9L1vTkpfW+COzEvI=
 -----END SIGNATURE-----
 
-router moria.mit.edu 9003 9023 9033 800000
+router moria3 moria.mit.edu 9003 9023 9033 800000
+platform Tor 0.0.2pre8 on Linux moria.mit.edu 2.4.18-27.7.xbigmem #1 SMP Fri Mar 14 05:08:50 EST 2003 i686
+published 2003-09-30 23:14:07
 onion-key
 -----BEGIN RSA PUBLIC KEY-----
 MIGJAoGBANS6J/Er9fYo03fjUUVesc7We9Z6xIevyDJH39pYS4NUlcr5ExYgSVFJ
@@ -74,8 +80,8 @@ IltsOF9TZ+66gCeU7LxExLdAMqT2Tx6VT4IREPJMeNxSiceEjbABAgMBAAE=
 -----END RSA PUBLIC KEY-----
 router-signature
 -----BEGIN SIGNATURE-----
-xm7Nmk7EmtDIrXZ/Hh2LBbG3oTuwCjY3XrVHpIbg6ttuoYJx3Ai1MdOHHBbUDVdz
-bRE6WV5fXuVgmgcWLP6p364Vymw6i2ff/lkEMqHV4NOAWZ1RbFwZQ5OjEAjXIhH/
-VlVX83wBSM0EefJwwXM7H075MU1MB+f2yRlTZ0/Xp0U=
+GWpK2Ux/UwDaNUHwq+Xn7denyYFGS8SIWwqiMgHyUzc5wj1t2gWubJ/rMyGL59U3
+o6L/9qV34aa5UyNNBHXwYkxy7ixgPURaRYpAbkQKPU3ew8BgNXG/MNLYllIUkrbb
+h6G5u8RGbto+Nby/OjIh9TqdgK/B1sOdwAHI/IXiDoY=
 -----END SIGNATURE-----
 
diff --git a/src/config/moria1-orrc b/src/config/moria1-orrc
index 5ff374310..b4a88c690 100644
--- a/src/config/moria1-orrc
+++ b/src/config/moria1-orrc
@@ -1,19 +1,13 @@
-# Configuration file for or
-
-OnionRouter 1
-
-# List of routers
-RouterFile ../config/routers.or
 
 DataDirectory moria1
 Nickname moria1
 
-CoinWeight 0.01
-
 ORPort 9001
 APPort 9021
 DirPort 9031
 
-# Maximum number of connections.
-MaxConn 900
+OnionRouter 1
+
+# List of routers
+RouterFile ../config/dirservers
 
diff --git a/src/config/moria2-orrc b/src/config/moria2-orrc
index f4f3f7ca4..33353d56d 100644
--- a/src/config/moria2-orrc
+++ b/src/config/moria2-orrc
@@ -1,19 +1,13 @@
-# Configuration file for or
-
-OnionRouter 1
-
-# List of routers
-RouterFile ../config/routers.or
 
 DataDirectory moria2
 Nickname moria2
 
-CoinWeight 0.01
-
 ORPort 9002
 APPort 9022
 DirPort 9032
 
-# Maximum number of connections.
-MaxConn 900
+OnionRouter 1
+
+# List of routers
+RouterFile ../config/dirservers
 
diff --git a/src/config/moria3-orrc b/src/config/moria3-orrc
index 71b80884e..d1e34d6e7 100644
--- a/src/config/moria3-orrc
+++ b/src/config/moria3-orrc
@@ -1,19 +1,13 @@
-# Configuration file for or
-
-OnionRouter 1
-
-# List of routers
-RouterFile ../config/routers.or
 
 DataDirectory moria3
 Nickname moria3
 
-CoinWeight 0.01
-
 ORPort 9003
 APPort 9023
 DirPort 9033
 
-# Maximum number of connections.
-MaxConn 900
+OnionRouter 1
+
+# List of routers
+RouterFile ../config/dirservers
 
diff --git a/src/config/oprc b/src/config/oprc
index 5d17d26d2..4ed2827fb 100644
--- a/src/config/oprc
+++ b/src/config/oprc
@@ -1,23 +1,12 @@
-# Configuration file for a typical or client
+# Configuration file for a typical tor client
 # (listen for applications only)
 
 # List of routers. Tor nodes only know about the directory servers
 # at the beginning, and from them they get a list of currently up nodes.
 RouterFile ../config/dirservers
 
-# A file containing this node's private key, if applicable
-# (No need to specify one, since we're just a client)
-#PrivateKeyFile foo
-
-# Should paths tend to be very long (CoinWeight close to 1) or
-# quite short (CoinWeight close to 0)?
-CoinWeight 0.01
-
 # Ports for various services. Comment out if you're not running that
 # service.
 #ORPort 9001
 APPort 9050
 
-# Maximum number of sockets (of any sort) this node can have open
-MaxConn 900
-
diff --git a/src/config/routers.or b/src/config/routers.or
deleted file mode 100644
index 47a58886f..000000000
--- a/src/config/routers.or
+++ /dev/null
@@ -1,78 +0,0 @@
-router moria.mit.edu 9001 9021 9031 800000
-onion-key
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBANoIvHieyHUTzIacbnWOnyTyzGrLOdXqbcjz2GGMxyHEd5K1bO1ZBNHP
-9i5qLQpN5viFk2K2rEGuG8tFgDEzSWZEtBqv3NVfUdiumdERWMBwlaQ0MVK4C+jf
-y5gZ8KI3o9ZictgPS1AQF+Kk932/vIHTuRIUKb4ILTnQilNvID0NAgMBAAE=
------END RSA PUBLIC KEY-----
-link-key
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAPt97bGDd9siVjPd7Xuq2s+amMEOLIj9961aSdP6/OT+BS1Q4TX2dNOX
-ZNAl63Z2fQISsR81+nfoqRLYCKxhajsD7LRvRTaRwUrWemVqFevmZ4nJrHw6FoU3
-xNUIHRMA8X2DZ+l5qgnWZb7JU50ohhX5OpMSyysXnik51J8hD5mBAgMBAAE=
------END RSA PUBLIC KEY-----
-signing-key
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAMHa0ZC/jo2Q2DrwKYF/6ZbmZ27PFYG91u4gUzzmZ/VXLpZ8wNzEV3oW
-nt+I61048fBiC1frT1/DZ351n2bLSk9zJbB6jyGZJn0380FPRX3+cXyXS0Gq8Ril
-xkhMQf5XuNFUb8UmYPSOH4WErjvYjKvU+gfjbK/82Jo9SuHpYz+BAgMBAAE=
------END RSA PUBLIC KEY-----
-router-signature
------BEGIN SIGNATURE-----
-fYcz+14lf2kilu0zGrkyAvfjNk2GfL5QClhdCiBuqy5fIkUS/969WZSWg9BXi7pK
-5+EgR9hvY4nAtJ2SBoE+lyOx7miuT/uGfH68wNkC0Le2gULcprDYFKAEc5i1o/aS
-Y/kuZIFDm2FXQPrYM88CIHAq8/3amUCskf2vC7l2eNE=
------END SIGNATURE-----
-
-router moria.mit.edu 9002 9022 9032 800000
-onion-key
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAM4Cc/npgYC54XrYLC+grVxJp7PDmNO2DRRJOxKttBBtvLpnR1UaueTi
-kyknT5kmlx+ihgZF/jmye//2dDUp2+kK/kSkpRV4xnDLXZmed+sNSQxqmm9TtZQ9
-/hjpxhp5J9HmUTYhntBs+4E4CUKokmrI6oRLoln4SA39AX9QLPcnAgMBAAE=
------END RSA PUBLIC KEY-----
-link-key
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAN7JVeCIJ7+0ZJew5ScOU58rTUqjGt1Z1Rkursc7WabEb8jno45VZwIs
-dkjnl31i36KHyyS7kQdHgkvG5EiyZiRipFAcoTaYv3Gvf1No9cXL6IhT3y/37dJ/
-kFPEMb/G2wdkJCC+D8fMwHBwMuqAg0JGuhoBOz0ArCgK3fq0BLilAgMBAAE=
------END RSA PUBLIC KEY-----
-signing-key
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAOcrht/y5rkaahfX7sMe2qnpqoPibsjTSJaDvsUtaNP/Bq0MgNDGOR48
-rtwfqTRff275Edkp/UYw3G3vSgKCJr76/bqOHCmkiZrnPV1zxNfrK18gNw2Cxre0
-nTA+fD8JQqpPtb8b0SnG9kwy75eS//sRu7TErie2PzGMxrf9LH0LAgMBAAE=
------END RSA PUBLIC KEY-----
-router-signature
------BEGIN SIGNATURE-----
-Hyx1fJFJaR9j7OpEg4qdxKo+AMXIZl6250AuiYmvdcwWD2VBJyhSbptB/vMLQGrU
-/PGWLlZus90xD/mKesc4b0CkwKD6eWI90Wn34JwBUGHalN/qm42tMMoq3slOWae0
-Da9JmxiYqApXwwaHWR9WwNHmkXkWfvTmZDSFkdEMgV0=
------END SIGNATURE-----
-
-router moria.mit.edu 9003 9023 9033 800000
-onion-key
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBANS6J/Er9fYo03fjUUVesc7We9Z6xIevyDJH39pYS4NUlcr5ExYgSVFJ
-95aLCNx1x8Rf5YtiBKYuT3plBO/+rfuX+0iAGNkz/y3SlJVGz6aeptU3wN8CkvCL
-zATEcnl4QSPhHX0wFB9A3t7wZ+Bat1PTI029lax/BkoS9JG5onHPAgMBAAE=
------END RSA PUBLIC KEY-----
-link-key
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKUMY8p+7LBu7dEJnOR9HqbfcD6c4/f9GqJt3o29uu4XJPD8z2XGVBik
-pZBLijhYS6U7GFg0NLR4zBlsLyB8TxHeaz5KJidJjy+BfC01jz1xwVTYDlmGVpc1
-0mw0Ag0ND6aOQKKhelxhTI3Bf0R9olEXuSUKEWx3EMIz2qhLd9oDAgMBAAE=
------END RSA PUBLIC KEY-----
-signing-key
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAMqgq83cwzSid2LSvzsn2rvkD8U0tWvqF6PuQAsKP3QHFqtBO+66pnIm
-CbiY2e6o01tmR47t557LuUCodEc8Blggxjg3ZEzvP42hsGB9LwQbcrU7grPRk0G0
-IltsOF9TZ+66gCeU7LxExLdAMqT2Tx6VT4IREPJMeNxSiceEjbABAgMBAAE=
------END RSA PUBLIC KEY-----
-router-signature
------BEGIN SIGNATURE-----
-xm7Nmk7EmtDIrXZ/Hh2LBbG3oTuwCjY3XrVHpIbg6ttuoYJx3Ai1MdOHHBbUDVdz
-bRE6WV5fXuVgmgcWLP6p364Vymw6i2ff/lkEMqHV4NOAWZ1RbFwZQ5OjEAjXIhH/
-VlVX83wBSM0EefJwwXM7H075MU1MB+f2yRlTZ0/Xp0U=
------END SIGNATURE-----
-
diff --git a/src/config/sample-orrc b/src/config/sample-orrc
index 6c2ed6f65..3e84c6415 100644
--- a/src/config/sample-orrc
+++ b/src/config/sample-orrc
@@ -1,7 +1,9 @@
 # Configuration file for a typical tor node
 
-# A file containing this node's private key
-PrivateKeyFile moria4-private
+# The directory for keeping all the config/data for this node
+DataDirectory moria4
+# A unique handle for this node
+Nickname moria4
 
 # Ports for various services. Comment out or set to 0 if you're not
 # offering that service.
@@ -10,16 +12,10 @@ OPPort 9014
 APPort 9024
 #DirPort 0
 
-# *** NO NEED TO EDIT BELOW THIS LINE ***
+# Leave this set, or we'll be treated like a client.
+OnionRouter 1
 
 # List of routers. Tor nodes only know about the directory servers
 # at the beginning, and from them they get a list of currently up nodes.
 RouterFile ../config/dirservers
 
-# Should paths tend to be very long (CoinWeight close to 1) or
-# quite short (CoinWeight close to 0)?
-CoinWeight 0.1
-
-# Maximum number of sockets (of any sort) this node can have open
-MaxConn 900
-