update the built-in dirservers default

svn:r1750

1 files changed, 72 insertions, 36 deletions

diff --git a/src/or/config.c b/src/or/config.c
index 7793f8029..2723ba702 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -234,88 +234,124 @@ static int config_assign(or_options_t *options, struct config_line_t *list) {
 /* XXX are there any other specifiers we want to give so making
  * a several-thousand-byte string is less painful? */
 const char default_dirservers_string[] =
-"router moria1 moria.mit.edu 9001 9021 9031 800000\n"
-"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\n"
-"published 2003-09-30 23:14:08\n"
+"router moria1 18.244.0.188 9001 9021 9031\n"
+"platform Tor 0.0.6rc1 on Linux moria.mit.edu i686\n"
+"published 2004-04-25 21:54:28\n"
+"bandwidth 800000 10000000\n"
 "onion-key\n"
 "-----BEGIN RSA PUBLIC KEY-----\n"
 "MIGJAoGBANoIvHieyHUTzIacbnWOnyTyzGrLOdXqbcjz2GGMxyHEd5K1bO1ZBNHP\n"
 "9i5qLQpN5viFk2K2rEGuG8tFgDEzSWZEtBqv3NVfUdiumdERWMBwlaQ0MVK4C+jf\n"
 "y5gZ8KI3o9ZictgPS1AQF+Kk932/vIHTuRIUKb4ILTnQilNvID0NAgMBAAE=\n"
 "-----END RSA PUBLIC KEY-----\n"
-"link-key\n"
-"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIGJAoGBAPt97bGDd9siVjPd7Xuq2s+amMEOLIj9961aSdP6/OT+BS1Q4TX2dNOX\n"
-"ZNAl63Z2fQISsR81+nfoqRLYCKxhajsD7LRvRTaRwUrWemVqFevmZ4nJrHw6FoU3\n"
-"xNUIHRMA8X2DZ+l5qgnWZb7JU50ohhX5OpMSyysXnik51J8hD5mBAgMBAAE=\n"
-"-----END RSA PUBLIC KEY-----\n"
 "signing-key\n"
 "-----BEGIN RSA PUBLIC KEY-----\n"
 "MIGJAoGBAMHa0ZC/jo2Q2DrwKYF/6ZbmZ27PFYG91u4gUzzmZ/VXLpZ8wNzEV3oW\n"
 "nt+I61048fBiC1frT1/DZ351n2bLSk9zJbB6jyGZJn0380FPRX3+cXyXS0Gq8Ril\n"
 "xkhMQf5XuNFUb8UmYPSOH4WErjvYjKvU+gfjbK/82Jo9SuHpYz+BAgMBAAE=\n"
 "-----END RSA PUBLIC KEY-----\n"
+"reject 0.0.0.0/255.0.0.0:*\n"
+"reject 169.254.0.0/255.255.0.0:*\n"
+"reject 127.0.0.0/255.0.0.0:*\n"
+"reject 192.168.0.0/255.255.0.0:*\n"
+"reject 10.0.0.0/255.0.0.0:*\n"
+"reject 172.16.0.0/255.240.0.0:*\n"
+"accept *:20-22\n"
+"accept *:53\n"
+"accept *:79-80\n"
+"accept *:110\n"
+"accept *:143\n"
+"accept *:443\n"
+"accept *:873\n"
+"accept *:993\n"
+"accept *:995\n"
+"accept *:1024-65535\n"
+"reject *:*\n"
 "router-signature\n"
 "-----BEGIN SIGNATURE-----\n"
-"Td3zb5d6uxO8oYGlmEHGzIdLuVm9s1Afqtm29JvRnnviQ36j6FZPlzPUaMVOUayn\n"
-"Wtz/CbaMj7mHSufpQ68wCLb1lQrtQkn7MkAWcQPIvZjpYh3UrcWrpfm7f/D+nKeN\n"
-"Z7UovF36xhCacjATNHhQNHHZHH6yONwN+Rf/N4kyPHw=\n"
+"o1eAoRHDAEAXsnh5wN++vIwrupd+DbAJ2p3wxHDrmqxTpygzxxCnyQyhMfX03ua2\n"
+"4iplyNlwyFwzWcw0sk31otlO2HBYXT1V9G0YxGtKMOeOBMHjfGbUjGvEALHzWi4z\n"
+"8DXGJp13zgnUyP4ZA6xaGROwcT6oB5e7UlztvvpGxTg=\n"
 "-----END SIGNATURE-----\n"
 "\n"
-"router moria2 moria.mit.edu 9002 9022 9032 800000\n"
-"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\n"
-"published 2003-09-30 23:14:05\n"
+"router moria2 18.244.0.188 9002 9022 9032\n"
+"platform Tor 0.0.6rc1 on Linux moria.mit.edu i686\n"
+"published 2004-04-25 21:54:30\n"
+"bandwidth 800000 10000000\n"
 "onion-key\n"
 "-----BEGIN RSA PUBLIC KEY-----\n"
 "MIGJAoGBAM4Cc/npgYC54XrYLC+grVxJp7PDmNO2DRRJOxKttBBtvLpnR1UaueTi\n"
 "kyknT5kmlx+ihgZF/jmye//2dDUp2+kK/kSkpRV4xnDLXZmed+sNSQxqmm9TtZQ9\n"
 "/hjpxhp5J9HmUTYhntBs+4E4CUKokmrI6oRLoln4SA39AX9QLPcnAgMBAAE=\n"
 "-----END RSA PUBLIC KEY-----\n"
-"link-key\n"
-"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIGJAoGBAN7JVeCIJ7+0ZJew5ScOU58rTUqjGt1Z1Rkursc7WabEb8jno45VZwIs\n"
-"dkjnl31i36KHyyS7kQdHgkvG5EiyZiRipFAcoTaYv3Gvf1No9cXL6IhT3y/37dJ/\n"
-"kFPEMb/G2wdkJCC+D8fMwHBwMuqAg0JGuhoBOz0ArCgK3fq0BLilAgMBAAE=\n"
-"-----END RSA PUBLIC KEY-----\n"
 "signing-key\n"
 "-----BEGIN RSA PUBLIC KEY-----\n"
 "MIGJAoGBAOcrht/y5rkaahfX7sMe2qnpqoPibsjTSJaDvsUtaNP/Bq0MgNDGOR48\n"
 "rtwfqTRff275Edkp/UYw3G3vSgKCJr76/bqOHCmkiZrnPV1zxNfrK18gNw2Cxre0\n"
 "nTA+fD8JQqpPtb8b0SnG9kwy75eS//sRu7TErie2PzGMxrf9LH0LAgMBAAE=\n"
 "-----END RSA PUBLIC KEY-----\n"
+"reject 0.0.0.0/255.0.0.0:*\n"
+"reject 169.254.0.0/255.255.0.0:*\n"
+"reject 127.0.0.0/255.0.0.0:*\n"
+"reject 192.168.0.0/255.255.0.0:*\n"
+"reject 10.0.0.0/255.0.0.0:*\n"
+"reject 172.16.0.0/255.240.0.0:*\n"
+"accept *:20-22\n"
+"accept *:53\n"
+"accept *:79-80\n"
+"accept *:110\n"
+"accept *:143\n"
+"accept *:443\n"
+"accept *:873\n"
+"accept *:993\n"
+"accept *:995\n"
+"accept *:1024-65535\n"
+"reject *:*\n"
 "router-signature\n"
 "-----BEGIN SIGNATURE-----\n"
-"X10a9Oc0LKNYKLDVzjRTIVT3NnE0y+xncllDDHSJSXR97fz3MBHGDqhy0Vgha/fe\n"
-"H/Y2E59oG01lYQ73j3JN+ibsCMtkzJDx2agCpV0LmakAD9ekHrYDWm/S41Ru6kf+\n"
-"PsyHpXlh7cZuGEX4U1pblSDFrQZ9L1vTkpfW+COzEvI=\n"
+"RKROLwP1ExjTZeg6wuN0pzYqed9IJUd5lAe9hp4ritbnmJAgS6qfww6jgx61CfUR\n"
+"6SElhOLE7Q77jAdoL45Ji5pn/Y+Q+E+5lJm1E/ed9ha+YsOPaOc7z6GQ7E4mihCL\n"
+"gI1vsw92+P1Ty4RHj6fyD9DhbV19nh2Qs+pvGJOS2FY=\n"
 "-----END SIGNATURE-----\n"
 "\n"
-"router moria3 moria.mit.edu 9003 9023 9033 800000\n"
-"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\n"
-"published 2003-09-30 23:14:07\n"
+"router moria3 18.244.0.188 9003 9023 9033\n"
+"platform Tor 0.0.6rc1 on Linux moria.mit.edu i686\n"
+"published 2004-04-25 21:54:31\n"
+"bandwidth 800000 10000000\n"
 "onion-key\n"
 "-----BEGIN RSA PUBLIC KEY-----\n"
 "MIGJAoGBANS6J/Er9fYo03fjUUVesc7We9Z6xIevyDJH39pYS4NUlcr5ExYgSVFJ\n"
 "95aLCNx1x8Rf5YtiBKYuT3plBO/+rfuX+0iAGNkz/y3SlJVGz6aeptU3wN8CkvCL\n"
 "zATEcnl4QSPhHX0wFB9A3t7wZ+Bat1PTI029lax/BkoS9JG5onHPAgMBAAE=\n"
 "-----END RSA PUBLIC KEY-----\n"
-"link-key\n"
-"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIGJAoGBAKUMY8p+7LBu7dEJnOR9HqbfcD6c4/f9GqJt3o29uu4XJPD8z2XGVBik\n"
-"pZBLijhYS6U7GFg0NLR4zBlsLyB8TxHeaz5KJidJjy+BfC01jz1xwVTYDlmGVpc1\n"
-"0mw0Ag0ND6aOQKKhelxhTI3Bf0R9olEXuSUKEWx3EMIz2qhLd9oDAgMBAAE=\n"
-"-----END RSA PUBLIC KEY-----\n"
 "signing-key\n"
 "-----BEGIN RSA PUBLIC KEY-----\n"
 "MIGJAoGBAMqgq83cwzSid2LSvzsn2rvkD8U0tWvqF6PuQAsKP3QHFqtBO+66pnIm\n"
 "CbiY2e6o01tmR47t557LuUCodEc8Blggxjg3ZEzvP42hsGB9LwQbcrU7grPRk0G0\n"
 "IltsOF9TZ+66gCeU7LxExLdAMqT2Tx6VT4IREPJMeNxSiceEjbABAgMBAAE=\n"
 "-----END RSA PUBLIC KEY-----\n"
+"reject 0.0.0.0/255.0.0.0:*\n"
+"reject 169.254.0.0/255.255.0.0:*\n"
+"reject 127.0.0.0/255.0.0.0:*\n"
+"reject 192.168.0.0/255.255.0.0:*\n"
+"reject 10.0.0.0/255.0.0.0:*\n"
+"reject 172.16.0.0/255.240.0.0:*\n"
+"accept *:20-22\n"
+"accept *:53\n"
+"accept *:79-80\n"
+"accept *:110\n"
+"accept *:143\n"
+"accept *:443\n"
+"accept *:873\n"
+"accept *:993\n"
+"accept *:995\n"
+"accept *:1024-65535\n"
+"reject *:*\n"
 "router-signature\n"
 "-----BEGIN SIGNATURE-----\n"
-"GWpK2Ux/UwDaNUHwq+Xn7denyYFGS8SIWwqiMgHyUzc5wj1t2gWubJ/rMyGL59U3\n"
-"o6L/9qV34aa5UyNNBHXwYkxy7ixgPURaRYpAbkQKPU3ew8BgNXG/MNLYllIUkrbb\n"
-"h6G5u8RGbto+Nby/OjIh9TqdgK/B1sOdwAHI/IXiDoY=\n"
+"QuoVInaiAnxgmZwCHVRTlcKrfRN4CmhcCJxQlwgeqnb1rg4LlFei3mic8+0vMF9r\n"
+"s74h2O1bF+bgbO7JmJ5ZxBG/U3UEL46kj1v9Y+FPhCihvaAZLJ5ajIbTw65tizg5\n"
+"8JOrpyjzPbaqPt31nE+3W0qpUNO8wWdxtnoGo7Kiibs=\n"
 "-----END SIGNATURE-----\n"
 ;