clean up the dead mirror list, renumber the mirror list, confirm these work.
Andrew Lewman

Andrew Lewman commited on 2009-03-02 03:24:41
Zeige 2 geänderte Dateien mit 147 Einfügungen und 246 Löschungen.

... ...
@@ -20,32 +20,32 @@
20 20
 
21 21
          <td>DE</td>
22 22
 
23
-         <td>Plentyfact</td>
23
+         <td>chaos darmstadt</td>
24 24
 
25 25
          <td>Sat Feb 28 11:23:06 2009</td>
26 26
 
27 27
     <td> - </td>
28
-    <td><a href="http://tor.plentyfact.net/dist/">http</a></td>
29
-    <td><a href="http://tor.plentyfact.net/">http</a></td>
30
-    <td><a href="https://tor.plentyfact.net/dist/">https</a></td>
31
-    <td><a href="https://tor.plentyfact.net/">https</a></td>
28
+    <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td>
29
+    <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td>
30
+    <td> - </td>
31
+    <td> - </td>
32 32
     <td> - </td>
33 33
     <td> - </td>
34 34
 </tr>
35 35
      
36 36
 <tr>
37 37
 
38
-         <td>US</td>
38
+         <td>DE</td>
39 39
 
40
-         <td>TheOnionRouter</td>
40
+         <td>Plentyfact</td>
41 41
 
42 42
          <td>Sat Feb 28 11:23:06 2009</td>
43 43
 
44 44
     <td> - </td>
45
-    <td><a href="http://www.theonionrouter.com/dist/">http</a></td>
46
-    <td><a href="http://www.theonionrouter.com/">http</a></td>
47
-    <td> - </td>
48
-    <td> - </td>
45
+    <td><a href="http://tor.plentyfact.net/dist/">http</a></td>
46
+    <td><a href="http://tor.plentyfact.net/">http</a></td>
47
+    <td><a href="https://tor.plentyfact.net/dist/">https</a></td>
48
+    <td><a href="https://tor.plentyfact.net/">https</a></td>
49 49
     <td> - </td>
50 50
     <td> - </td>
51 51
 </tr>
... ...
@@ -86,15 +86,15 @@
86 86
      
87 87
 <tr>
88 88
 
89
-         <td>NL</td>
89
+         <td>CN</td>
90 90
 
91
-         <td>Amorphis</td>
91
+         <td>Anonymity</td>
92 92
 
93 93
          <td>Sat Feb 28 11:23:06 2009</td>
94 94
 
95 95
     <td> - </td>
96
-    <td><a href="http://tor.amorphis.eu/dist/">http</a></td>
97
-    <td><a href="http://tor.amorphis.eu/">http</a></td>
96
+    <td><a href="http://tor.anonymity.cn/dist/">http</a></td>
97
+    <td><a href="http://tor.anonymity.cn/">http</a></td>
98 98
     <td> - </td>
99 99
     <td> - </td>
100 100
     <td> - </td>
... ...
@@ -105,13 +105,13 @@
105 105
 
106 106
          <td>CH</td>
107 107
 
108
-         <td>Unfix</td>
108
+         <td>Sixx</td>
109 109
 
110 110
          <td>Sat Feb 28 11:23:06 2009</td>
111 111
 
112 112
     <td> - </td>
113
-    <td><a href="http://tor.unfix.org/dist/">http</a></td>
114
-    <td><a href="http://tor.unfix.org/">http</a></td>
113
+    <td><a href="http://tor.sixxs.net/dist/">http</a></td>
114
+    <td><a href="http://tor.sixxs.net/">http</a></td>
115 115
     <td> - </td>
116 116
     <td> - </td>
117 117
     <td> - </td>
... ...
@@ -120,15 +120,32 @@
120 120
      
121 121
 <tr>
122 122
 
123
-         <td>DE</td>
123
+         <td>US</td>
124 124
 
125
-         <td>chaos darmstadt</td>
125
+         <td>TheOnionRouter</td>
126 126
 
127 127
          <td>Sat Feb 28 11:23:06 2009</td>
128 128
 
129 129
     <td> - </td>
130
-    <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td>
131
-    <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td>
130
+    <td><a href="http://www.theonionrouter.com/dist/">http</a></td>
131
+    <td><a href="http://www.theonionrouter.com/">http</a></td>
132
+    <td> - </td>
133
+    <td> - </td>
134
+    <td> - </td>
135
+    <td> - </td>
136
+</tr>
137
+     
138
+<tr>
139
+
140
+         <td>HU</td>
141
+
142
+         <td>Unknown</td>
143
+
144
+         <td>Sat Feb 28 11:23:06 2009</td>
145
+
146
+    <td> - </td>
147
+    <td><a href="http://mirror.tor.hu/dist/">http</a></td>
148
+    <td><a href="http://mirror.tor.hu/">http</a></td>
132 149
     <td> - </td>
133 150
     <td> - </td>
134 151
     <td> - </td>
... ...
@@ -139,13 +156,13 @@
139 156
 
140 157
          <td>CH</td>
141 158
 
142
-         <td>Sixx</td>
159
+         <td>Unfix</td>
143 160
 
144 161
          <td>Sat Feb 28 11:23:06 2009</td>
145 162
 
146 163
     <td> - </td>
147
-    <td><a href="http://tor.sixxs.net/dist/">http</a></td>
148
-    <td><a href="http://tor.sixxs.net/">http</a></td>
164
+    <td><a href="http://tor.unfix.org/dist/">http</a></td>
165
+    <td><a href="http://tor.unfix.org/">http</a></td>
149 166
     <td> - </td>
150 167
     <td> - </td>
151 168
     <td> - </td>
... ...
@@ -154,15 +171,15 @@
154 171
      
155 172
 <tr>
156 173
 
157
-         <td>HU</td>
174
+         <td>NL</td>
158 175
 
159
-         <td>Unknown</td>
176
+         <td>Amorphis</td>
160 177
 
161 178
          <td>Sat Feb 28 11:23:06 2009</td>
162 179
 
163 180
     <td> - </td>
164
-    <td><a href="http://mirror.tor.hu/dist/">http</a></td>
165
-    <td><a href="http://mirror.tor.hu/">http</a></td>
181
+    <td><a href="http://tor.amorphis.eu/dist/">http</a></td>
182
+    <td><a href="http://tor.amorphis.eu/">http</a></td>
166 183
     <td> - </td>
167 184
     <td> - </td>
168 185
     <td> - </td>
... ...
@@ -188,15 +205,15 @@
188 205
      
189 206
 <tr>
190 207
 
191
-         <td>CH</td>
208
+         <td>NL</td>
192 209
 
193
-         <td>Boinc</td>
210
+         <td>CCC</td>
194 211
 
195 212
          <td>Thu Feb 19 03:47:21 2009</td>
196 213
 
197 214
     <td> - </td>
198
-    <td><a href="http://tor.boinc.ch/dist/">http</a></td>
199
-    <td><a href="http://tor.boinc.ch/">http</a></td>
215
+    <td><a href="http://tor.ccc.de/dist/">http</a></td>
216
+    <td><a href="http://tor.ccc.de/">http</a></td>
200 217
     <td> - </td>
201 218
     <td> - </td>
202 219
     <td> - </td>
... ...
@@ -205,15 +222,15 @@
205 222
      
206 223
 <tr>
207 224
 
208
-         <td>DE</td>
225
+         <td>CH</td>
209 226
 
210
-         <td>Bbs</td>
227
+         <td>Boinc</td>
211 228
 
212
-         <td>Sat Nov  8 01:59:27 2008</td>
229
+         <td>Thu Feb 19 03:47:21 2009</td>
213 230
 
214 231
     <td> - </td>
215
-    <td> - </td>
216
-    <td><a href="http://tor.blingblingsquad.net/">http</a></td>
232
+    <td><a href="http://tor.boinc.ch/dist/">http</a></td>
233
+    <td><a href="http://tor.boinc.ch/">http</a></td>
217 234
     <td> - </td>
218 235
     <td> - </td>
219 236
     <td> - </td>
... ...
@@ -258,30 +275,30 @@
258 275
 
259 276
          <td>NL</td>
260 277
 
261
-         <td>BIT BV</td>
278
+         <td>OS Mirror</td>
262 279
 
263 280
          <td>Unknown</td>
264 281
 
265
-    <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td>
266
-    <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td>
267
-    <td> - </td>
282
+    <td><a href="ftp://ftp.osmirror.nl/pub/tor/">ftp</a></td>
283
+    <td><a href="http://tor.osmirror.nl/">http</a></td>
268 284
     <td> - </td>
269 285
     <td> - </td>
270 286
     <td> - </td>
271 287
     <td> - </td>
288
+    <td><a href="rsync://rsync.osmirror.nl::tor/">rsync</a></td>
272 289
 </tr>
273 290
      
274 291
 <tr>
275 292
 
276
-         <td>AU</td>
293
+         <td>DK</td>
277 294
 
278
-         <td>Wiretapped</td>
295
+         <td>Zentrum der Gesundheit</td>
279 296
 
280 297
          <td>Unknown</td>
281 298
 
282
-    <td><a href="ftp://ftp.mirrors.wiretapped.net/pub/security/cryptography/network/tor/">ftp</a></td>
283
-    <td><a href="http://www.mirrors.wiretapped.net/security/cryptography/network/tor/">http</a></td>
284 299
     <td> - </td>
300
+    <td><a href="http://tor.zdg-gmbh.eu/dist/">http</a></td>
301
+    <td><a href="http://tor.zdg-gmbh.eu/">http</a></td>
285 302
     <td> - </td>
286 303
     <td> - </td>
287 304
     <td> - </td>
... ...
@@ -307,15 +324,15 @@
307 324
      
308 325
 <tr>
309 326
 
310
-         <td>UA</td>
327
+         <td>AU</td>
311 328
 
312
-         <td>Technica-03</td>
329
+         <td>Wiretapped</td>
313 330
 
314 331
          <td>Unknown</td>
315 332
 
333
+    <td><a href="ftp://ftp.mirrors.wiretapped.net/pub/security/cryptography/network/tor/">ftp</a></td>
334
+    <td><a href="http://www.mirrors.wiretapped.net/security/cryptography/network/tor/">http</a></td>
316 335
     <td> - </td>
317
-    <td><a href="http://tordistua.reactor-xg.kiev.ua">http</a></td>
318
-    <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td>
319 336
     <td> - </td>
320 337
     <td> - </td>
321 338
     <td> - </td>
... ...
@@ -324,15 +341,15 @@
324 341
      
325 342
 <tr>
326 343
 
327
-         <td>DE</td>
344
+         <td>NO</td>
328 345
 
329
-         <td>Cybermirror</td>
346
+         <td>Meulie</td>
330 347
 
331 348
          <td>Unknown</td>
332 349
 
333 350
     <td> - </td>
334
-    <td><a href="http://tor.cybermirror.org/dist/">http</a></td>
335
-    <td><a href="http://tor.cybermirror.org/">http</a></td>
351
+    <td><a href="http://tor.meulie.net/">http</a></td>
352
+    <td> - </td>
336 353
     <td> - </td>
337 354
     <td> - </td>
338 355
     <td> - </td>
... ...
@@ -341,15 +358,15 @@
341 358
      
342 359
 <tr>
343 360
 
344
-         <td>CN</td>
361
+         <td>DE</td>
345 362
 
346
-         <td>Unknown</td>
363
+         <td>Cybermirror</td>
347 364
 
348 365
          <td>Unknown</td>
349 366
 
350 367
     <td> - </td>
351
-    <td><a href="http://free.be.ijing2008.cn/tor/dist/">http</a></td>
352
-    <td><a href="http://free.be.ijing2008.cn/tor/">http</a></td>
368
+    <td><a href="http://tor.cybermirror.org/dist/">http</a></td>
369
+    <td><a href="http://tor.cybermirror.org/">http</a></td>
353 370
     <td> - </td>
354 371
     <td> - </td>
355 372
     <td> - </td>
... ...
@@ -358,15 +375,15 @@
358 375
      
359 376
 <tr>
360 377
 
361
-         <td>CN</td>
378
+         <td>US</td>
362 379
 
363
-         <td>Anonymity</td>
380
+         <td>BJWOnline</td>
364 381
 
365 382
          <td>Unknown</td>
366 383
 
367 384
     <td> - </td>
368
-    <td><a href="http://tor.anonymity.cn/dist/">http</a></td>
369
-    <td><a href="http://tor.anonymity.cn/">http</a></td>
385
+    <td><a href="http://mirror.bjwonline.com/tor/dist/">http</a></td>
386
+    <td><a href="http://mirror.bjwonline.com/tor/">http</a></td>
370 387
     <td> - </td>
371 388
     <td> - </td>
372 389
     <td> - </td>
... ...
@@ -375,15 +392,15 @@
375 392
      
376 393
 <tr>
377 394
 
378
-         <td>US</td>
395
+         <td>CN</td>
379 396
 
380
-         <td>BJWOnline</td>
397
+         <td>Unknown</td>
381 398
 
382 399
          <td>Unknown</td>
383 400
 
384 401
     <td> - </td>
385
-    <td><a href="http://mirror.bjwonline.com/tor/dist/">http</a></td>
386
-    <td><a href="http://mirror.bjwonline.com/tor/">http</a></td>
402
+    <td><a href="http://free.be.ijing2008.cn/tor/dist/">http</a></td>
403
+    <td><a href="http://free.be.ijing2008.cn/tor/">http</a></td>
387 404
     <td> - </td>
388 405
     <td> - </td>
389 406
     <td> - </td>
... ...
@@ -392,14 +409,14 @@
392 409
      
393 410
 <tr>
394 411
 
395
-         <td>NO</td>
412
+         <td>NL</td>
396 413
 
397
-         <td>Meulie</td>
414
+         <td>BIT BV</td>
398 415
 
399 416
          <td>Unknown</td>
400 417
 
401
-    <td> - </td>
402
-    <td><a href="http://tor.meulie.net/">http</a></td>
418
+    <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td>
419
+    <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td>
403 420
     <td> - </td>
404 421
     <td> - </td>
405 422
     <td> - </td>
... ...
@@ -409,85 +426,85 @@
409 426
      
410 427
 <tr>
411 428
 
412
-         <td>FR</td>
429
+         <td>UK</td>
413 430
 
414
-         <td>CRAN</td>
431
+         <td>Ghirai</td>
415 432
 
416 433
          <td>Unknown</td>
417 434
 
418
-    <td><a href="ftp://miroir-francais.fr/pub/tor/">ftp</a></td>
419
-    <td><a href="http://tor.miroir-francais.fr/">http</a></td>
435
+    <td> - </td>
436
+    <td><a href="http://www.ghirai.com/tor/">http</a></td>
437
+    <td> - </td>
420 438
     <td> - </td>
421 439
     <td> - </td>
422 440
     <td> - </td>
423 441
     <td> - </td>
424
-    <td><a href="rsync://miroir-francais.fr::tor">rsync</a></td>
425 442
 </tr>
426 443
      
427 444
 <tr>
428 445
 
429
-         <td>NL</td>
446
+         <td>UA</td>
430 447
 
431
-         <td>OS Mirror</td>
448
+         <td>Technica-03</td>
432 449
 
433 450
          <td>Unknown</td>
434 451
 
435
-    <td><a href="ftp://ftp.osmirror.nl/pub/tor/">ftp</a></td>
436
-    <td><a href="http://tor.osmirror.nl/">http</a></td>
452
+    <td> - </td>
453
+    <td><a href="http://tordistua.reactor-xg.kiev.ua">http</a></td>
454
+    <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td>
437 455
     <td> - </td>
438 456
     <td> - </td>
439 457
     <td> - </td>
440 458
     <td> - </td>
441
-    <td><a href="rsync://rsync.osmirror.nl::tor/">rsync</a></td>
442 459
 </tr>
443 460
      
444 461
 <tr>
445 462
 
446
-         <td>UK</td>
463
+         <td>FR</td>
447 464
 
448
-         <td>Ghirai</td>
465
+         <td>CRAN</td>
449 466
 
450 467
          <td>Unknown</td>
451 468
 
452
-    <td> - </td>
453
-    <td><a href="http://www.ghirai.com/tor/">http</a></td>
454
-    <td> - </td>
469
+    <td><a href="ftp://miroir-francais.fr/pub/tor/">ftp</a></td>
470
+    <td><a href="http://tor.miroir-francais.fr/">http</a></td>
455 471
     <td> - </td>
456 472
     <td> - </td>
457 473
     <td> - </td>
458 474
     <td> - </td>
475
+    <td><a href="rsync://miroir-francais.fr::tor">rsync</a></td>
459 476
 </tr>
460 477
      
461 478
 <tr>
462 479
 
463
-         <td>DK</td>
480
+         <td>AT</td>
464 481
 
465
-         <td>Zentrum der Gesundheit</td>
482
+         <td>Cypherpunks</td>
466 483
 
467 484
          <td>Unknown</td>
468 485
 
469 486
     <td> - </td>
470
-    <td><a href="http://tor.zdg-gmbh.eu/dist/">http</a></td>
471
-    <td><a href="http://tor.zdg-gmbh.eu/">http</a></td>
472
-    <td> - </td>
487
+    <td><a href="http://tor.cypherpunks.at/dist/">http</a></td>
488
+    <td><a href="http://tor.cypherpunks.at/">http</a></td>
473 489
     <td> - </td>
474 490
     <td> - </td>
475 491
     <td> - </td>
492
+    <td><a href="rsync://tor.cypherpunks.at/tor">rsync</a></td>
476 493
 </tr>
477 494
      
478 495
 <tr>
479 496
 
480
-         <td>AT</td>
497
+         <td>DE</td>
481 498
 
482
-         <td>Cypherpunks</td>
499
+         <td>Berapla</td>
483 500
 
484 501
          <td>Unknown</td>
485 502
 
486 503
     <td> - </td>
487
-    <td><a href="http://tor.cypherpunks.at/dist/">http</a></td>
488
-    <td><a href="http://tor.cypherpunks.at/">http</a></td>
504
+    <td><a href="http://download.berapla.de/mirrors/tor/dist/">http</a></td>
505
+    <td><a href="http://download.berapla.de/mirrors/tor/">http</a></td>
506
+    <td> - </td>
489 507
     <td> - </td>
490 508
     <td> - </td>
491 509
     <td> - </td>
492
-    <td><a href="rsync://tor.cypherpunks.at/tor">rsync</a></td>
493 510
 </tr>
... ...
@@ -175,21 +175,21 @@ my %m = (
175 175
             updateDate => "Unknown",
176 176
         },
177 177
 
178
-       # mirror005 => {
179
-            # orgName => "Berapla",
180
-            # isoCC => "DE",
181
-            # subRegion => "",
182
-            # region => "Europe",
183
-            # ipv4 => "True",
184
-            # ipv6 => "False",
185
-            # loadBalanced => "Unknown",
186
-            # httpWebsiteMirror => "http://download.berapla.de/mirrors/tor/",
187
-            # ftpWebsiteMirror => "",
188
-            # rsyncWebsiteMirror => "",
189
-            # httpDistMirror => "",
190
-            # rsyncDistMirror => "",
191
-            # updateDate => "Unknown",
192
-        # },
178
+       mirror005 => {
179
+            orgName => "Berapla",
180
+            isoCC => "DE",
181
+            subRegion => "",
182
+            region => "Europe",
183
+            ipv4 => "True",
184
+            ipv6 => "False",
185
+            loadBalanced => "Unknown",
186
+            httpWebsiteMirror => "http://download.berapla.de/mirrors/tor/",
187
+            ftpWebsiteMirror => "",
188
+            rsyncWebsiteMirror => "",
189
+            httpDistMirror => "http://download.berapla.de/mirrors/tor/dist/",
190
+            rsyncDistMirror => "",
191
+            updateDate => "Unknown",
192
+        },
193 193
 
194 194
        mirror006 => {
195 195
             adminContact => "cm.cybermirror.org",
... ...
@@ -261,39 +261,7 @@ my %m = (
261 261
             updateDate => "Unknown",
262 262
         },
263 263
 
264
-       # mirror011 => {
265
-            # orgName => "loxal.net",
266
-            # isoCC => "DE",
267
-            # subRegion => "",
268
-            # region => "Europe",
269
-            # ipv4 => "True",
270
-            # ipv6 => "False",
271
-            # loadBalanced => "Unknown",
272
-            # httpWebsiteMirror => "http://tor-anonymizer.mirror.loxal.net/",
273
-            # ftpWebsiteMirror => "",
274
-            # rsyncWebsiteMirror => "",
275
-            # httpDistMirror => "http://tor-anonymizer.mirror.loxal.net/dist/",
276
-            # rsyncDistMirror => "",
277
-            # updateDate => "Unknown",
278
-        # },
279
-
280
-       # mirror012 => {
281
-            # orgName => "centervenus.com",
282
-            # isoCC => "DE",
283
-            # subRegion => "",
284
-            # region => "Europe",
285
-            # ipv4 => "True",
286
-            # ipv6 => "False",
287
-            # loadBalanced => "Unknown",
288
-            # httpWebsiteMirror => "",
289
-            # ftpWebsiteMirror => "",
290
-            # rsyncWebsiteMirror => "",
291
-            # httpDistMirror => "http://www.centervenus.com/mirrors/tor/dist/",
292
-            # rsyncDistMirror => "",
293
-            # updateDate => "Unknown",
294
-        # },
295
-
296
-       mirror013 => {
264
+       mirror011 => {
297 265
             adminContact => "info.zentrum-der-gesundheit.de",
298 266
             orgName => "Zentrum der Gesundheit",
299 267
             isoCC => "DK",
... ...
@@ -310,7 +278,7 @@ my %m = (
310 278
             updateDate => "Unknown",
311 279
         },
312 280
 
313
-       mirror014 => {
281
+       mirror012 => {
314 282
             adminContact => "kurt.miroir-francais.fr",
315 283
             orgName => "CRAN",
316 284
             isoCC => "FR",
... ...
@@ -327,23 +295,7 @@ my %m = (
327 295
             updateDate => "Unknown",
328 296
         },
329 297
 
330
-       # mirror015 => {
331
-            # orgName => "tor.newworldorder.com.es",
332
-            # isoCC => "HU",
333
-            # subRegion => "",
334
-            # region => "Europe",
335
-            # ipv4 => "True",
336
-            # ipv6 => "False",
337
-            # loadBalanced => "Unknown",
338
-            # httpWebsiteMirror => "http://tor.newworldorder.com.es/",
339
-            # rsyncWebsiteMirror => "",
340
-            # ftpWebsiteMirror => "",
341
-            # httpDistMirror => "",
342
-            # rsyncDistMirror => "",
343
-            # updateDate => "Unknown",
344
-        # },
345
-
346
-       mirror016 => {
298
+       mirror013 => {
347 299
             adminContact => "root.amorphis.eu",
348 300
             orgName => "Amorphis",
349 301
             isoCC => "NL",
... ...
@@ -360,7 +312,7 @@ my %m = (
360 312
             updateDate => "Unknown",
361 313
         },
362 314
 
363
-       mirror017 => {
315
+       mirror014 => {
364 316
             adminContact => "mirror.bit.nl",
365 317
             orgName => "BIT BV",
366 318
             isoCC => "NL",
... ...
@@ -377,7 +329,7 @@ my %m = (
377 329
             updateDate => "Unknown",
378 330
         },
379 331
 
380
-       mirror018 => {
332
+       mirror015 => {
381 333
             adminContact => "webmaster.ccc.de",
382 334
             orgName => "CCC",
383 335
             isoCC => "NL",
... ...
@@ -394,7 +346,7 @@ my %m = (
394 346
             updateDate => "Unknown",
395 347
         },
396 348
 
397
-       mirror018 => {
349
+       mirror016 => {
398 350
             adminContact => "root.kamagurka.org",
399 351
             orgName => "Kamagurka",
400 352
             isoCC => "NL",
... ...
@@ -411,7 +363,7 @@ my %m = (
411 363
             updateDate => "Unknown",
412 364
         },
413 365
 
414
-       mirror019 => {
366
+       mirror017 => {
415 367
             adminContact => "mirrors.osmirror.nl",
416 368
             orgName => "OS Mirror",
417 369
             isoCC => "NL",
... ...
@@ -429,7 +381,7 @@ my %m = (
429 381
         },
430 382
 
431 383
 
432
-       mirror020 => {
384
+       mirror018 => {
433 385
             adminContact => "evert.meulie.net",
434 386
             orgName => "Meulie",
435 387
             isoCC => "NO",
... ...
@@ -446,23 +398,7 @@ my %m = (
446 398
             updateDate => "Unknown",
447 399
         },
448 400
 
449
-       # mirror021 => {
450
-            # orgName => "Swedish Linux Society",
451
-            # isoCC => "SE",
452
-            # subRegion => "",
453
-            # region => "Europe",
454
-            # ipv4 => "True",
455
-            # ipv6 => "False",
456
-            # loadBalanced => "Unknown",
457
-            # httpWebsiteMirror => "http://ftp.se.linux.org/crypto/tor/",
458
-            # rsyncWebsiteMirror => "",
459
-            # ftpWebsiteMirror => "ftp://ftp.se.linux.org/pub/crypto/tor/",
460
-            # httpDistMirror => "",
461
-            # rsyncDistMirror => "",
462
-            # updateDate => "Unknown",
463
-        # },
464
-
465
-       mirror022 => {
401
+       mirror019 => {
466 402
             adminContact => "ghirai.ghirai.com",
467 403
             orgName => "Ghirai",
468 404
             isoCC => "UK",
... ...
@@ -479,7 +415,7 @@ my %m = (
479 415
             updateDate => "Unknown",
480 416
         },
481 417
 
482
-       mirror023 => {
418
+       mirror020 => {
483 419
 	    adminContact => "bjw.bjwonline.com",
484 420
             orgName => "BJWOnline",
485 421
             isoCC => "US",
... ...
@@ -496,23 +432,7 @@ my %m = (
496 432
             updateDate => "Unknown",
497 433
         },
498 434
 
499
-       # mirror024 => {
500
-            # orgName => "Libertarian Action Network",
501
-            # isoCC => "US",
502
-            # subRegion => "",
503
-            # region => "North America",
504
-            # ipv4 => "True",
505
-            # ipv6 => "False",
506
-            # loadBalanced => "Unknown",
507
-            # httpWebsiteMirror => "",
508
-            # rsyncWebsiteMirror => "",
509
-            # ftpWebsiteMirror => "ftp://libertarianactivism.com/tor.eff.org/dist/",
510
-            # httpDistMirror => "",
511
-            # rsyncDistMirror => "",
512
-            # updateDate => "Unknown",
513
-        # },
514
-
515
-       mirror025 => {
435
+       mirror021 => {
516 436
 	    adminContact => "hostmaster.zombiewerks.com",
517 437
             orgName => "TheOnionRouter",
518 438
             isoCC => "US",
... ...
@@ -529,23 +449,7 @@ my %m = (
529 449
             updateDate => "Unknown",
530 450
         },
531 451
 
532
-       # mirror026 => {
533
-            # orgName => "Site2nd.org",
534
-            # isoCC => "USA",
535
-            # subRegion => "Texas",
536
-            # region => "North America",
537
-            # ipv4 => "True",
538
-            # ipv6 => "False",
539
-            # loadBalanced => "Unknown",
540
-            # httpWebsiteMirror => "http://tor.site2nd.org",
541
-            # rsyncWebsiteMirror => "",
542
-            # ftpWebsiteMirror => "",
543
-            # httpDistMirror => "",
544
-            # rsyncDistMirror => "",
545
-            # updateDate => "Unknown",
546
-        # },
547
-
548
-       mirror027 => {
452
+       mirror022 => {
549 453
             adminContact => "jeroen.unfix.org",
550 454
             orgName => "Unfix",
551 455
             isoCC => "CH",
... ...
@@ -562,7 +466,7 @@ my %m = (
562 466
             updateDate => "Unknown",
563 467
         },
564 468
 
565
-       mirror028 => {
469
+       mirror023 => {
566 470
             adminContact => "jeroen.unfix.org",
567 471
             orgName => "Sixx",
568 472
             isoCC => "CH",
... ...
@@ -579,7 +483,7 @@ my %m = (
579 483
             updateDate => "Unknown",
580 484
         },
581 485
 
582
-       mirror029 => {
486
+       mirror024 => {
583 487
             adminContact => "",
584 488
             orgName => "Crypto",
585 489
             isoCC => "US",
... ...
@@ -596,7 +500,7 @@ my %m = (
596 500
             updateDate => "Unknown",
597 501
         },
598 502
 
599
-       mirror030 => {
503
+       mirror025 => {
600 504
             adminContact => "web2005a.year2005a.wiretapped.net",
601 505
             orgName => "Wiretapped",
602 506
             isoCC => "AU",
... ...
@@ -613,7 +517,7 @@ my %m = (
613 517
             updateDate => "Unknown",
614 518
         },
615 519
 
616
-        mirror031 => {
520
+        mirror026 => {
617 521
             adminContact => "tormaster.xpdm.us",
618 522
             orgName => "Xpdm",
619 523
             isoCC => "US",
... ...
@@ -633,27 +537,7 @@ my %m = (
633 537
             updateDate => "Unknown",
634 538
         },
635 539
 
636
-        # mirror032 => {
637
-            # adminContact => "abuse.misericordia.be",
638
-            # orgName => "Misericordia",
639
-            # isoCC => "FR",
640
-            # subRegion => "France",
641
-            # region => "Europe",
642
-            # ipv4 => "True",
643
-            # ipv6 => "False",
644
-            # loadBalanced => "No",
645
-            # httpWebsiteMirror => "http://mirror.misericordia.be/",
646
-            # httpsWebsiteMirror => "",
647
-            # rsyncWebsiteMirror => "",
648
-            # ftpWebsiteMirror => "",
649
-            # httpDistMirror => "http://mirror.misericordia.be/dist/",
650
-            # httpsDistMirror => "",
651
-            # rsyncDistMirror => "",
652
-            # hiddenServiceMirror => "",
653
-            # updateDate => "Unknown",
654
-        # },
655
-
656
-        mirror033 => {
540
+        mirror027 => {
657 541
             adminContact => "internetfreebeijing\@gmail.com",
658 542
             orgName => "Unknown",
659 543
             isoCC => "CN",
... ...
@@ -673,7 +557,7 @@ my %m = (
673 557
             updateDate => "Unknown",
674 558
         },
675 559
 
676
-        mirror034 => {
560
+        mirror028 => {
677 561
             adminContact => "security\@hostoffice.hu",
678 562
             orgName => "Unknown",
679 563
             isoCC => "HU",
... ...
@@ -692,7 +576,7 @@ my %m = (
692 576
             hiddenServiceMirror => "",
693 577
             updateDate => "Unknown",
694 578
         },
695
-        mirror035 => {
579
+        mirror029 => {
696 580
             adminContact => "",
697 581
             orgName => "Technica-03",
698 582
             isoCC => "UA",
... ...
@@ -711,7 +595,7 @@ my %m = (
711 595
             hiddenServiceMirror => "",
712 596
             updateDate => "Unknown",
713 597
         },
714
-	mirror036 => {
598
+	mirror030 => {
715 599
             adminContact => "",
716 600
             orgName => "chaos darmstadt",
717 601
             isoCC => "DE",
718 602