give us a new dirservers file

svn:r1700

1 files changed, 72 insertions, 36 deletions

diff --git a/src/config/dirservers b/src/config/dirservers
index 19a82692ef..0999a74799 100644
--- a/src/config/dirservers
+++ b/src/config/dirservers
@@ -1,87 +1,123 @@
 # This is no longer a manually-editable file. It's just a
 # concatenation of a bunch of signed router descriptors.
 
-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
+router moria1 18.244.0.188 9001 9021 9031
+platform Tor 0.0.6rc1 on Linux moria.mit.edu i686
+published 2004-04-25 21:54:28
+bandwidth 800000 10000000
 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-----
+reject 0.0.0.0/255.0.0.0:*
+reject 169.254.0.0/255.255.0.0:*
+reject 127.0.0.0/255.0.0.0:*
+reject 192.168.0.0/255.255.0.0:*
+reject 10.0.0.0/255.0.0.0:*
+reject 172.16.0.0/255.240.0.0:*
+accept *:20-22
+accept *:53
+accept *:79-80
+accept *:110
+accept *:143
+accept *:443
+accept *:873
+accept *:993
+accept *:995
+accept *:1024-65535
+reject *:*
 router-signature
 -----BEGIN SIGNATURE-----
-Td3zb5d6uxO8oYGlmEHGzIdLuVm9s1Afqtm29JvRnnviQ36j6FZPlzPUaMVOUayn
-Wtz/CbaMj7mHSufpQ68wCLb1lQrtQkn7MkAWcQPIvZjpYh3UrcWrpfm7f/D+nKeN
-Z7UovF36xhCacjATNHhQNHHZHH6yONwN+Rf/N4kyPHw=
+o1eAoRHDAEAXsnh5wN++vIwrupd+DbAJ2p3wxHDrmqxTpygzxxCnyQyhMfX03ua2
+4iplyNlwyFwzWcw0sk31otlO2HBYXT1V9G0YxGtKMOeOBMHjfGbUjGvEALHzWi4z
+8DXGJp13zgnUyP4ZA6xaGROwcT6oB5e7UlztvvpGxTg=
 -----END SIGNATURE-----
 
-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
+router moria2 18.244.0.188 9002 9022 9032
+platform Tor 0.0.6rc1 on Linux moria.mit.edu i686
+published 2004-04-25 21:54:30
+bandwidth 800000 10000000
 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-----
+reject 0.0.0.0/255.0.0.0:*
+reject 169.254.0.0/255.255.0.0:*
+reject 127.0.0.0/255.0.0.0:*
+reject 192.168.0.0/255.255.0.0:*
+reject 10.0.0.0/255.0.0.0:*
+reject 172.16.0.0/255.240.0.0:*
+accept *:20-22
+accept *:53
+accept *:79-80
+accept *:110
+accept *:143
+accept *:443
+accept *:873
+accept *:993
+accept *:995
+accept *:1024-65535
+reject *:*
 router-signature
 -----BEGIN SIGNATURE-----
-X10a9Oc0LKNYKLDVzjRTIVT3NnE0y+xncllDDHSJSXR97fz3MBHGDqhy0Vgha/fe
-H/Y2E59oG01lYQ73j3JN+ibsCMtkzJDx2agCpV0LmakAD9ekHrYDWm/S41Ru6kf+
-PsyHpXlh7cZuGEX4U1pblSDFrQZ9L1vTkpfW+COzEvI=
+RKROLwP1ExjTZeg6wuN0pzYqed9IJUd5lAe9hp4ritbnmJAgS6qfww6jgx61CfUR
+6SElhOLE7Q77jAdoL45Ji5pn/Y+Q+E+5lJm1E/ed9ha+YsOPaOc7z6GQ7E4mihCL
+gI1vsw92+P1Ty4RHj6fyD9DhbV19nh2Qs+pvGJOS2FY=
 -----END SIGNATURE-----
 
-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
+router moria3 18.244.0.188 9003 9023 9033
+platform Tor 0.0.6rc1 on Linux moria.mit.edu i686
+published 2004-04-25 21:54:31
+bandwidth 800000 10000000
 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-----
+reject 0.0.0.0/255.0.0.0:*
+reject 169.254.0.0/255.255.0.0:*
+reject 127.0.0.0/255.0.0.0:*
+reject 192.168.0.0/255.255.0.0:*
+reject 10.0.0.0/255.0.0.0:*
+reject 172.16.0.0/255.240.0.0:*
+accept *:20-22
+accept *:53
+accept *:79-80
+accept *:110
+accept *:143
+accept *:443
+accept *:873
+accept *:993
+accept *:995
+accept *:1024-65535
+reject *:*
 router-signature
 -----BEGIN SIGNATURE-----
-GWpK2Ux/UwDaNUHwq+Xn7denyYFGS8SIWwqiMgHyUzc5wj1t2gWubJ/rMyGL59U3
-o6L/9qV34aa5UyNNBHXwYkxy7ixgPURaRYpAbkQKPU3ew8BgNXG/MNLYllIUkrbb
-h6G5u8RGbto+Nby/OjIh9TqdgK/B1sOdwAHI/IXiDoY=
+QuoVInaiAnxgmZwCHVRTlcKrfRN4CmhcCJxQlwgeqnb1rg4LlFei3mic8+0vMF9r
+s74h2O1bF+bgbO7JmJ5ZxBG/U3UEL46kj1v9Y+FPhCihvaAZLJ5ajIbTw65tizg5
+8JOrpyjzPbaqPt31nE+3W0qpUNO8wWdxtnoGo7Kiibs=
 -----END SIGNATURE-----