Browse code

move torbutton back to a main path rather than buried in projects, update versions.wmi to be current, update the mirrors table, need a better blurb in info.wmi.

Andrew Lewman authored on 18/08/2010 14:06:31
Showing 8 changed files
... ...
@@ -47,7 +47,7 @@ and state security known as <a href="<page about/overview>">traffic analysis</a>
47 47
             <tr>
48 48
               <td>
49 49
                 <img src="images/icon-default.jpg" alt="Default Icon" />
50
-                <h3><a href="<page projects/torbutton>">TorButton</a></h3>
50
+                <h3><a href="<page torbutton/>">TorButton</a></h3>
51 51
                 <p>Torbutton is a 1-click way for Firefox users to enable or disable the browser's use of Tor. </p>
52 52
               </td>
53 53
               <td>
... ...
@@ -2,7 +2,7 @@
2 2
 <div class="img-shadow">
3 3
   <div class="infoblock">
4 4
     <h2 class="bulb">Tor Tip</h2>
5
-    <p>If you take a step towards online privacy by downloading Tor, that’s great, but remember that Tor can only be effective if you use the programs it’s developed for!</p>
5
+    <p>Use Tor correctly or go away. NEED BETTER BLURB.</p>
6 6
   </div>
7 7
   <!-- END INFOBLOCK -->              
8 8
 </div>
... ...
@@ -1,21 +1,4 @@
1 1
      
2
-<tr>
3
-
4
-         <td>UK</td>
5
-
6
-         <td>tomyn</td>
7
-
8
-         <td>Up to date</td>
9
-
10
-    <td><a href="ftp://tor.tomyn.com">ftp</a></td>
11
-    <td><a href="http://tor.tomyn.com/dist">http</a></td>
12
-    <td><a href="http://tor.tomyn.com">http</a></td>
13
-    <td><a href="https://tor.tomyn.com/dist">https</a></td>
14
-    <td><a href="https://tor.tomyn.com">https</a></td>
15
-    <td> - </td>
16
-    <td> - </td>
17
-</tr>
18
-     
19 2
 <tr>
20 3
 
21 4
          <td>EE</td>
... ...
@@ -35,49 +18,15 @@
35 18
      
36 19
 <tr>
37 20
 
38
-         <td> </td>
39
-
40
-         <td> spacecowboy </td>
41
-
42
-         <td>Up to date</td>
43
-
44
-    <td> - </td>
45
-    <td><a href="http://tor-proxy.de/tor-mirror/dist/">http</a></td>
46
-    <td><a href="http://tor-proxy.de/tor-mirror/">http</a></td>
47
-    <td><a href="https://tor-proxy.de/tor-mirror/dist/">https</a></td>
48
-    <td><a href="https://tor-proxy.de/tor-mirror/">https</a></td>
49
-    <td> - </td>
50
-    <td> - </td>
51
-</tr>
52
-     
53
-<tr>
54
-
55
-         <td>US</td>
56
-
57
-         <td>BarkerJr</td>
58
-
59
-         <td>Up to date</td>
60
-
61
-    <td> - </td>
62
-    <td><a href="http://www.torproject.us/dist/">http</a></td>
63
-    <td><a href="http://www.torproject.us/">http</a></td>
64
-    <td><a href="https://www.torproject.us/dist/">https</a></td>
65
-    <td><a href="https://www.torproject.us/">https</a></td>
66
-    <td> - </td>
67
-    <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td>
68
-</tr>
69
-     
70
-<tr>
71
-
72
-         <td>US</td>
21
+         <td>IR</td>
73 22
 
74
-         <td>TheOnionRouter</td>
23
+         <td>Access</td>
75 24
 
76 25
          <td>Up to date</td>
77 26
 
78 27
     <td> - </td>
79
-    <td><a href="http://www.theonionrouter.com/dist/">http</a></td>
80
-    <td><a href="http://www.theonionrouter.com/">http</a></td>
28
+    <td><a href="http://irani-tor.ath.cx/dist/">http</a></td>
29
+    <td><a href="http://irani-tor.ath.cx/">http</a></td>
81 30
     <td> - </td>
82 31
     <td> - </td>
83 32
     <td> - </td>
... ...
@@ -95,57 +44,23 @@
95 44
     <td> - </td>
96 45
     <td><a href="http://tor.beme-it.de/dist/">http</a></td>
97 46
     <td><a href="http://tor.beme-it.de/">http</a></td>
98
-    <td> - </td>
99
-    <td> - </td>
47
+    <td><a href="https://tor.beme-it.de/dist/">https</a></td>
48
+    <td><a href="https://tor.beme-it.de/">https</a></td>
100 49
     <td> - </td>
101 50
     <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td>
102 51
 </tr>
103 52
      
104 53
 <tr>
105 54
 
106
-         <td>AT</td>
55
+         <td>INT</td>
107 56
 
108
-         <td></td>
57
+         <td>CoralCDN</td>
109 58
 
110 59
          <td>Up to date</td>
111 60
 
112 61
     <td> - </td>
113
-    <td><a href="http://tor.idnr.at/dist/">http</a></td>
114
-    <td><a href="http://tor.idnr.at/">http</a></td>
115
-    <td> - </td>
116
-    <td> - </td>
117
-    <td> - </td>
118
-    <td> - </td>
119
-</tr>
120
-     
121
-<tr>
122
-
123
-         <td>NL</td>
124
-
125
-         <td>CCC</td>
126
-
127
-         <td>Up to date</td>
128
-
129
-    <td> - </td>
130
-    <td><a href="http://tor.ccc.de/dist/">http</a></td>
131
-    <td><a href="http://tor.ccc.de/">http</a></td>
132
-    <td> - </td>
133
-    <td> - </td>
134
-    <td> - </td>
135
-    <td> - </td>
136
-</tr>
137
-     
138
-<tr>
139
-
140
-         <td>RU</td>
141
-
142
-         <td></td>
143
-
144
-         <td>Up to date</td>
145
-
146
-    <td> - </td>
147
-    <td><a href="http://www.tor.myeveryday.ru/dist/">http</a></td>
148
-    <td><a href="http://www.tor.myeveryday.ru/">http</a></td>
62
+    <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td>
63
+    <td><a href="http://www.torproject.org.nyud.net/">http</a></td>
149 64
     <td> - </td>
150 65
     <td> - </td>
151 66
     <td> - </td>
... ...
@@ -163,25 +78,8 @@
163 78
     <td> - </td>
164 79
     <td><a href="http://www.oignon.net/dist/">http</a></td>
165 80
     <td><a href="http://www.oignon.net/">http</a></td>
166
-    <td><a href="https://oignon.net/dist/">https</a></td>
167
-    <td><a href="https://oignon.net/">https</a></td>
168
-    <td> - </td>
169
-    <td> - </td>
170
-</tr>
171
-     
172
-<tr>
173
-
174
-         <td>DK</td>
175
-
176
-         <td>Zentrum der Gesundheit</td>
177
-
178
-         <td>Up to date</td>
179
-
180
-    <td> - </td>
181
-    <td><a href="http://tor.idnr.ws/dist/">http</a></td>
182
-    <td><a href="http://tor.idnr.ws/">http</a></td>
183
-    <td> - </td>
184
-    <td> - </td>
81
+    <td><a href="https://www.oignon.net/dist/">https</a></td>
82
+    <td><a href="https://www.oignon.net/">https</a></td>
185 83
     <td> - </td>
186 84
     <td> - </td>
187 85
 </tr>
... ...
@@ -190,149 +88,47 @@
190 88
 
191 89
          <td>US</td>
192 90
 
193
-         <td>AskApache</td>
194
-
195
-         <td>Up to date</td>
196
-
197
-    <td> - </td>
198
-    <td><a href="http://tor.askapache.com/dist/">http</a></td>
199
-    <td><a href="http://tor.askapache.com/">http</a></td>
200
-    <td> - </td>
201
-    <td> - </td>
202
-    <td> - </td>
203
-    <td> - </td>
204
-</tr>
205
-     
206
-<tr>
207
-
208
-         <td>DE</td>
209
-
210
-         <td>chaos darmstadt</td>
211
-
212
-         <td>Up to date</td>
213
-
214
-    <td> - </td>
215
-    <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td>
216
-    <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td>
217
-    <td> - </td>
218
-    <td> - </td>
219
-    <td> - </td>
220
-    <td> - </td>
221
-</tr>
222
-     
223
-<tr>
224
-
225
-         <td>SE</td>
226
-
227
-         <td></td>
228
-
229
-         <td>Up to date</td>
230
-
231
-    <td> - </td>
232
-    <td><a href="http://tor.homosu.net/dist">http</a></td>
233
-    <td><a href="http://tor.homosu.net/">http</a></td>
234
-    <td> - </td>
235
-    <td> - </td>
236
-    <td> - </td>
237
-    <td> - </td>
238
-</tr>
239
-     
240
-<tr>
241
-
242
-         <td>HU</td>
243
-
244
-         <td>NIIF Institute</td>
245
-
246
-         <td>Up to date</td>
247
-
248
-    <td> - </td>
249
-    <td><a href="http://trak.tor.hu/dist/">http</a></td>
250
-    <td><a href="http://trak.tor.hu/">http</a></td>
251
-    <td> - </td>
252
-    <td> - </td>
253
-    <td> - </td>
254
-    <td> - </td>
255
-</tr>
256
-     
257
-<tr>
258
-
259
-         <td>HU</td>
260
-
261
-         <td>Unknown</td>
91
+         <td>BarkerJr</td>
262 92
 
263 93
          <td>Up to date</td>
264 94
 
265 95
     <td> - </td>
96
+    <td><a href="http://www.torproject.us/dist/">http</a></td>
97
+    <td><a href="http://www.torproject.us/">http</a></td>
98
+    <td><a href="https://www.torproject.us/dist/">https</a></td>
99
+    <td><a href="https://www.torproject.us/">https</a></td>
266 100
     <td> - </td>
267
-    <td><a href="http://tor.hu/">http</a></td>
268
-    <td> - </td>
269
-    <td> - </td>
270
-    <td> - </td>
271
-    <td> - </td>
101
+    <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td>
272 102
 </tr>
273 103
      
274 104
 <tr>
275 105
 
276
-         <td>IR</td>
106
+         <td> </td>
277 107
 
278
-         <td>Access</td>
108
+         <td> spacecowboy </td>
279 109
 
280 110
          <td>Up to date</td>
281 111
 
282 112
     <td> - </td>
283
-    <td><a href="http://irani-tor.ath.cx/dist/">http</a></td>
284
-    <td><a href="http://irani-tor.ath.cx/">http</a></td>
285
-    <td> - </td>
286
-    <td> - </td>
287
-    <td> - </td>
288
-    <td> - </td>
289
-</tr>
290
-     
291
-<tr>
292
-
293
-         <td>CN</td>
294
-
295
-         <td>zuola</td>
296
-
297
-         <td>Out of date</td>
298
-
299
-    <td> - </td>
300
-    <td><a href="http://tor.zuo.la/dist/">http</a></td>
301
-    <td><a href="http://tor.zuo.la/">http</a></td>
302
-    <td> - </td>
303
-    <td> - </td>
304
-    <td> - </td>
305
-    <td> - </td>
306
-</tr>
307
-     
308
-<tr>
309
-
310
-         <td>CN</td>
311
-
312
-         <td>shizhao</td>
313
-
314
-         <td>Out of date</td>
315
-
316
-    <td> - </td>
317
-    <td><a href="http://tor.shizhao.org/dist/">http</a></td>
318
-    <td><a href="http://tor.shizhao.org/">http</a></td>
319
-    <td> - </td>
320
-    <td> - </td>
113
+    <td><a href="http://tor-proxy.de/tor-mirror/dist/">http</a></td>
114
+    <td><a href="http://tor-proxy.de/tor-mirror/">http</a></td>
115
+    <td><a href="https://tor-proxy.de/tor-mirror/dist/">https</a></td>
116
+    <td><a href="https://tor-proxy.de/tor-mirror/">https</a></td>
321 117
     <td> - </td>
322 118
     <td> - </td>
323 119
 </tr>
324 120
      
325 121
 <tr>
326 122
 
327
-         <td>CN</td>
123
+         <td>NL</td>
328 124
 
329
-         <td>bullog</td>
125
+         <td>Amorphis</td>
330 126
 
331 127
          <td>Out of date</td>
332 128
 
333 129
     <td> - </td>
334
-    <td><a href="http://tor.bullog.org/dist/">http</a></td>
335
-    <td><a href="http://tor.bullog.org/">http</a></td>
130
+    <td><a href="http://tor.amorphis.eu/dist/">http</a></td>
131
+    <td><a href="http://tor.amorphis.eu/">http</a></td>
336 132
     <td> - </td>
337 133
     <td> - </td>
338 134
     <td> - </td>
... ...
@@ -341,17 +137,17 @@
341 137
      
342 138
 <tr>
343 139
 
344
-         <td>CN</td>
140
+         <td>UK</td>
345 141
 
346
-         <td>ranyunfei</td>
142
+         <td>tomyn</td>
347 143
 
348 144
          <td>Out of date</td>
349 145
 
350
-    <td> - </td>
351
-    <td><a href="http://tor.ranyunfei.com/dist/">http</a></td>
352
-    <td><a href="http://tor.ranyunfei.com/">http</a></td>
353
-    <td> - </td>
354
-    <td> - </td>
146
+    <td><a href="ftp://tor.tomyn.com">ftp</a></td>
147
+    <td><a href="http://tor.tomyn.com/dist">http</a></td>
148
+    <td><a href="http://tor.tomyn.com">http</a></td>
149
+    <td><a href="https://tor.tomyn.com/dist">https</a></td>
150
+    <td><a href="https://tor.tomyn.com">https</a></td>
355 151
     <td> - </td>
356 152
     <td> - </td>
357 153
 </tr>
... ...
@@ -360,30 +156,13 @@
360 156
 
361 157
          <td>NL</td>
362 158
 
363
-         <td>Amorphis</td>
364
-
365
-         <td>Out of date</td>
366
-
367
-    <td> - </td>
368
-    <td><a href="http://tor.amorphis.eu/dist/">http</a></td>
369
-    <td><a href="http://tor.amorphis.eu/">http</a></td>
370
-    <td> - </td>
371
-    <td> - </td>
372
-    <td> - </td>
373
-    <td> - </td>
374
-</tr>
375
-     
376
-<tr>
377
-
378
-         <td>CN</td>
379
-
380
-         <td>wuerkaixi</td>
159
+         <td>CCC</td>
381 160
 
382 161
          <td>Out of date</td>
383 162
 
384 163
     <td> - </td>
385
-    <td><a href="http://tor.wuerkaixi.com/dist/">http</a></td>
386
-    <td><a href="http://tor.wuerkaixi.com/">http</a></td>
164
+    <td><a href="http://tor.ccc.de/dist/">http</a></td>
165
+    <td><a href="http://tor.ccc.de/">http</a></td>
387 166
     <td> - </td>
388 167
     <td> - </td>
389 168
     <td> - </td>
... ...
@@ -392,15 +171,15 @@
392 171
      
393 172
 <tr>
394 173
 
395
-         <td> </td>
174
+         <td>DK</td>
396 175
 
397
-         <td> cybervalley </td>
176
+         <td>Zentrum der Gesundheit</td>
398 177
 
399 178
          <td>Out of date</td>
400 179
 
401 180
     <td> - </td>
402
-    <td> - </td>
403
-    <td><a href="http://torproject.cybervalley.org/">http</a></td>
181
+    <td><a href="http://tor.idnr.ws/dist/">http</a></td>
182
+    <td><a href="http://tor.idnr.ws/">http</a></td>
404 183
     <td> - </td>
405 184
     <td> - </td>
406 185
     <td> - </td>
... ...
@@ -409,15 +188,15 @@
409 188
      
410 189
 <tr>
411 190
 
412
-         <td>CA</td>
191
+         <td>CH</td>
413 192
 
414
-         <td>Hermetix</td>
193
+         <td>Boinc</td>
415 194
 
416 195
          <td>Out of date</td>
417 196
 
418 197
     <td> - </td>
419
-    <td> - </td>
420
-    <td><a href="http://tor.hermetix.org/">http</a></td>
198
+    <td><a href="http://tor.boinc.ch/dist/">http</a></td>
199
+    <td><a href="http://tor.boinc.ch/">http</a></td>
421 200
     <td> - </td>
422 201
     <td> - </td>
423 202
     <td> - </td>
... ...
@@ -428,13 +207,13 @@
428 207
 
429 208
          <td>DE</td>
430 209
 
431
-         <td>Bbs</td>
210
+         <td>chaos darmstadt</td>
432 211
 
433 212
          <td>Out of date</td>
434 213
 
435 214
     <td> - </td>
436
-    <td> - </td>
437
-    <td><a href="http://tor.blingblingsquad.net/">http</a></td>
215
+    <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td>
216
+    <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td>
438 217
     <td> - </td>
439 218
     <td> - </td>
440 219
     <td> - </td>
... ...
@@ -443,15 +222,15 @@
443 222
      
444 223
 <tr>
445 224
 
446
-         <td>DE</td>
447
-
448
-         <td>Spline</td>
225
+         <td>HU</td>
449 226
 
450 227
          <td>Unknown</td>
451 228
 
229
+         <td>Out of date</td>
230
+
452 231
     <td> - </td>
453
-    <td><a href="http://rem.spline.de/tor/">http</a></td>
454 232
     <td> - </td>
233
+    <td><a href="http://tor.hu/">http</a></td>
455 234
     <td> - </td>
456 235
     <td> - </td>
457 236
     <td> - </td>
... ...
@@ -464,7 +243,7 @@
464 243
 
465 244
          <td>Xpdm</td>
466 245
 
467
-         <td>Unknown</td>
246
+         <td>Out of date</td>
468 247
 
469 248
     <td> - </td>
470 249
     <td><a href="http://torproj.xpdm.us/dist/">http</a></td>
... ...
@@ -477,15 +256,15 @@
477 256
      
478 257
 <tr>
479 258
 
480
-         <td>DE</td>
259
+         <td>US</td>
481 260
 
482
-         <td>Cybermirror</td>
261
+         <td>AskApache</td>
483 262
 
484
-         <td>Unknown</td>
263
+         <td>Out of date</td>
485 264
 
486 265
     <td> - </td>
487
-    <td><a href="http://tor.cybermirror.org/dist/">http</a></td>
488
-    <td><a href="http://tor.cybermirror.org/">http</a></td>
266
+    <td><a href="http://tor.askapache.com/dist/">http</a></td>
267
+    <td><a href="http://tor.askapache.com/">http</a></td>
489 268
     <td> - </td>
490 269
     <td> - </td>
491 270
     <td> - </td>
... ...
@@ -494,15 +273,15 @@
494 273
      
495 274
 <tr>
496 275
 
497
-         <td>AU</td>
276
+         <td>HU</td>
498 277
 
499
-         <td>Wiretapped</td>
278
+         <td>NIIF Institute</td>
500 279
 
501
-         <td>Unknown</td>
280
+         <td>Out of date</td>
502 281
 
503
-    <td><a href="ftp://ftp.mirrors.wiretapped.net/pub/security/cryptography/network/tor/">ftp</a></td>
504
-    <td><a href="http://www.mirrors.wiretapped.net/security/cryptography/network/tor/">http</a></td>
505 282
     <td> - </td>
283
+    <td><a href="http://trak.tor.hu/dist/">http</a></td>
284
+    <td><a href="http://trak.tor.hu/">http</a></td>
506 285
     <td> - </td>
507 286
     <td> - </td>
508 287
     <td> - </td>
... ...
@@ -513,13 +292,13 @@
513 292
 
514 293
          <td>US</td>
515 294
 
516
-         <td>I'm on the roof</td>
295
+         <td>TheOnionRouter</td>
517 296
 
518
-         <td>Unknown</td>
297
+         <td>Out of date</td>
519 298
 
520 299
     <td> - </td>
521
-    <td><a href="http://mirror.imontheroof.com/tor-mirror/dist/">http</a></td>
522
-    <td><a href="http://mirror.imontheroof.com/tor-mirror/">http</a></td>
300
+    <td><a href="http://www.theonionrouter.com/dist/">http</a></td>
301
+    <td><a href="http://www.theonionrouter.com/">http</a></td>
523 302
     <td> - </td>
524 303
     <td> - </td>
525 304
     <td> - </td>
... ...
@@ -528,32 +307,15 @@
528 307
      
529 308
 <tr>
530 309
 
531
-         <td>CH</td>
310
+         <td>IT</td>
532 311
 
533
-         <td>Sixx</td>
312
+         <td>cybervalley</td>
534 313
 
535
-         <td>Unknown</td>
314
+         <td>Out of date</td>
536 315
 
537
-    <td> - </td>
538
-    <td><a href="http://tor.sixxs.net/dist/">http</a></td>
539
-    <td><a href="http://tor.sixxs.net/">http</a></td>
540
-    <td> - </td>
541 316
     <td> - </td>
542 317
     <td> - </td>
543
-    <td> - </td>
544
-</tr>
545
-     
546
-<tr>
547
-
548
-         <td>CH</td>
549
-
550
-         <td>Unfix</td>
551
-
552
-         <td>Unknown</td>
553
-
554
-    <td> - </td>
555
-    <td><a href="http://tor.unfix.org/dist/">http</a></td>
556
-    <td><a href="http://tor.unfix.org/">http</a></td>
318
+    <td><a href="http://torproject.cybervalley.org/">http</a></td>
557 319
     <td> - </td>
558 320
     <td> - </td>
559 321
     <td> - </td>
... ...
@@ -562,15 +324,15 @@
562 324
      
563 325
 <tr>
564 326
 
565
-         <td>IN</td>
327
+         <td>SE</td>
566 328
 
567
-         <td></td>
329
+         <td>homosu</td>
568 330
 
569
-         <td>Unknown</td>
331
+         <td>Out of date</td>
570 332
 
571 333
     <td> - </td>
572
-    <td><a href="http://www.torproject.org.in/dist/">http</a></td>
573
-    <td><a href="http://www.torproject.org.in/">http</a></td>
334
+    <td><a href="http://tor.homosu.net/dist">http</a></td>
335
+    <td><a href="http://tor.homosu.net/">http</a></td>
574 336
     <td> - </td>
575 337
     <td> - </td>
576 338
     <td> - </td>
... ...
@@ -579,32 +341,32 @@
579 341
      
580 342
 <tr>
581 343
 
582
-         <td>FR</td>
344
+         <td>DE</td>
583 345
 
584
-         <td>CRAN</td>
346
+         <td>[[:bbs:]]</td>
585 347
 
586
-         <td>Unknown</td>
348
+         <td>Out of date</td>
587 349
 
588
-    <td><a href="ftp://miroir-francais.fr/pub/tor/">ftp</a></td>
589
-    <td><a href="http://tor.miroir-francais.fr/">http</a></td>
590
-    <td> - </td>
591 350
     <td> - </td>
351
+    <td><a href="http://tor.blingblingsquad.net/dist">http</a></td>
352
+    <td><a href="http://tor.blingblingsquad.net/">http</a></td>
353
+    <td><a href="https://tor.blingblingsquad.net/dist">https</a></td>
354
+    <td><a href="https://tor.blingblingsquad.net/">https</a></td>
592 355
     <td> - </td>
593 356
     <td> - </td>
594
-    <td><a href="rsync://miroir-francais.fr::tor">rsync</a></td>
595 357
 </tr>
596 358
      
597 359
 <tr>
598 360
 
599
-         <td>NO</td>
361
+         <td>UA</td>
600 362
 
601
-         <td>Meulie</td>
363
+         <td>Technica-03</td>
602 364
 
603 365
          <td>Unknown</td>
604 366
 
605 367
     <td> - </td>
606
-    <td><a href="http://tor.meulie.net/">http</a></td>
607
-    <td> - </td>
368
+    <td><a href="http://tordistua.reactor-xg.kiev.ua/">http</a></td>
369
+    <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td>
608 370
     <td> - </td>
609 371
     <td> - </td>
610 372
     <td> - </td>
... ...
@@ -628,23 +390,6 @@
628 390
     <td> - </td>
629 391
 </tr>
630 392
      
631
-<tr>
632
-
633
-         <td>HU</td>
634
-
635
-         <td>ax</td>
636
-
637
-         <td>Unknown</td>
638
-
639
-    <td> - </td>
640
-    <td><a href="http://tor.initrd.net/dist/">http</a></td>
641
-    <td> - </td>
642
-    <td> - </td>
643
-    <td> - </td>
644
-    <td> - </td>
645
-    <td> - </td>
646
-</tr>
647
-     
648 393
 <tr>
649 394
 
650 395
          <td>NL</td>
... ...
@@ -664,14 +409,14 @@
664 409
      
665 410
 <tr>
666 411
 
667
-         <td>UK</td>
412
+         <td>RO</td>
668 413
 
669
-         <td>Ghirai</td>
414
+         <td>mirrors.sykotik.org</td>
670 415
 
671 416
          <td>Unknown</td>
672 417
 
673
-    <td> - </td>
674
-    <td><a href="http://www.ghirai.com/tor/">http</a></td>
418
+    <td><a href="ftp://mirrors.sykotik.org/pub/tor/">ftp</a></td>
419
+    <td><a href="http://mirrors.sykotik.org/pub/tor/">http</a></td>
675 420
     <td> - </td>
676 421
     <td> - </td>
677 422
     <td> - </td>
... ...
@@ -681,15 +426,15 @@
681 426
      
682 427
 <tr>
683 428
 
684
-         <td>UA</td>
429
+         <td>IN</td>
685 430
 
686
-         <td>Technica-03</td>
431
+         <td>India Tor Fans</td>
687 432
 
688 433
          <td>Unknown</td>
689 434
 
690 435
     <td> - </td>
691
-    <td><a href="http://tordistua.reactor-xg.kiev.ua/">http</a></td>
692
-    <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td>
436
+    <td><a href="http://www.torproject.org.in/dist/">http</a></td>
437
+    <td><a href="http://www.torproject.org.in/">http</a></td>
693 438
     <td> - </td>
694 439
     <td> - </td>
695 440
     <td> - </td>
... ...
@@ -698,15 +443,15 @@
698 443
      
699 444
 <tr>
700 445
 
701
-         <td></td>
446
+         <td>NO</td>
702 447
 
703
-         <td>StrangeCharm</td>
448
+         <td>Meulie</td>
704 449
 
705 450
          <td>Unknown</td>
706 451
 
707 452
     <td> - </td>
708
-    <td><a href="http://torproject.the-onion-router.net/dist/">http</a></td>
709
-    <td><a href="http://torproject.the-onion-router.net/">http</a></td>
453
+    <td><a href="http://tor.meulie.net/">http</a></td>
454
+    <td> - </td>
710 455
     <td> - </td>
711 456
     <td> - </td>
712 457
     <td> - </td>
... ...
@@ -715,15 +460,15 @@
715 460
      
716 461
 <tr>
717 462
 
718
-         <td>CH</td>
463
+         <td>DE</td>
719 464
 
720
-         <td>Boinc</td>
465
+         <td>Spline</td>
721 466
 
722 467
          <td>Unknown</td>
723 468
 
724 469
     <td> - </td>
725
-    <td><a href="http://tor.boinc.ch/dist/">http</a></td>
726
-    <td><a href="http://tor.boinc.ch/">http</a></td>
470
+    <td><a href="http://rem.spline.de/tor/">http</a></td>
471
+    <td> - </td>
727 472
     <td> - </td>
728 473
     <td> - </td>
729 474
     <td> - </td>
... ...
@@ -1,45 +1,47 @@
1 1
 <define-tag version-stable whitespace=delete>0.2.1.26</define-tag>
2
-<define-tag version-alpha whitespace=delete>0.2.2.13-alpha</define-tag>
2
+<define-tag version-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
3 3
 
4 4
 <define-tag version-win32-stable whitespace=delete>0.2.1.26</define-tag>
5
-<define-tag version-win32-alpha whitespace=delete>0.2.2.13-alpha</define-tag>
5
+<define-tag version-win32-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
6 6
 
7 7
 <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.26</define-tag>
8
-<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.13-alpha</define-tag>
8
+<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
9 9
 
10 10
 <define-tag version-osx-bundle-stable whitespace=delete>0.2.1.26</define-tag>
11
-<define-tag version-osx-bundle-alpha whitespace=delete>0.2.2.13-alpha</define-tag>
11
+<define-tag version-osx-bundle-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
12 12
 
13 13
 <define-tag version-oldosx-bundle-stable whitespace=delete>0.2.1.26</define-tag>
14
-<define-tag version-oldosx-bundle-alpha whitespace=delete>0.2.2.13-alpha</define-tag>
14
+<define-tag version-oldosx-bundle-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
15 15
 
16 16
 <define-tag version-osx-stable whitespace=delete>0.2.1.26</define-tag>
17
-<define-tag version-osx-alpha whitespace=delete>0.2.2.13-alpha</define-tag>
17
+<define-tag version-osx-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
18 18
 
19 19
 <define-tag version-oldosx-stable whitespace=delete>0.2.1.26</define-tag>
20
-<define-tag version-oldosx-alpha whitespace=delete>0.2.2.13-alpha</define-tag>
20
+<define-tag version-oldosx-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
21 21
 
22
-<define-tag version-torbrowserbundle whitespace=delete>1.3.6</define-tag>
22
+<define-tag version-torbrowserbundle whitespace=delete>1.3.9</define-tag>
23 23
 <define-tag version-torbrowser-tor whitespace=delete>0.2.1.26</define-tag>
24 24
 <define-tag version-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8l</define-tag>
25
-<define-tag version-torbrowser-firefox whitespace=delete>3.5.9</define-tag>
25
+<define-tag version-torbrowser-firefox whitespace=delete>3.5.11</define-tag>
26 26
 <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
27 27
 <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
28
-<define-tag version-torbrowser-pidgin whitespace=delete>2.6.6</define-tag>
28
+<define-tag version-torbrowser-pidgin whitespace=delete>2.7.2</define-tag>
29 29
 <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
30 30
 <define-tag version-torbrowser-vidalia whitespace=delete>0.2.9</define-tag>
31
-<define-tag version-torimbrowserbundle whitespace=delete>1.3.6</define-tag>
31
+<define-tag version-torimbrowserbundle whitespace=delete>1.3.9</define-tag>
32 32
 
33
-<define-tag version-torbrowserbundlelinux whitespace=delete>1.0.7</define-tag>
34
-<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.13-alpha</define-tag>
33
+<define-tag version-torbrowserbundlelinux whitespace=delete>1.0.9</define-tag>
34
+<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.14-alpha</define-tag>
35 35
 <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8l</define-tag>
36
-<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.5.8</define-tag>
36
+<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.5.10</define-tag>
37 37
 <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
38 38
 <define-tag version-gnu-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
39 39
 <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.9</define-tag>
40 40
 
41
+<define-tag version-vidalia-stable whitespace=delete>0.2.9</define-tag>
42
+
41 43
 <define-tag version-androidbundle-tor whitespace=delete>0.2.2.13-alpha</define-tag>
42
-<define-tag version-androidbundle-orbot whitespace=delete>0.0.7</define-tag>
44
+<define-tag version-androidbundle-orbot whitespace=delete>0.0.8</define-tag>
43 45
 <define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag>
44 46
 <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag>
45 47
 <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag>
... ...
@@ -57,7 +59,7 @@
57 59
 <define-tag package-osx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-alpha>-0.2.9-i386.dmg</define-tag>
58 60
 
59 61
 <define-tag package-oldosx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-oldosx-bundle-stable>-0.2.8-ppc.dmg</define-tag>
60
-<define-tag package-oldosx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-oldosx-bundle-alpha>-0.2.8-ppc.dmg</define-tag>
62
+<define-tag package-oldosx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-oldosx-bundle-alpha>-0.2.9-ppc.dmg</define-tag>
61 63
 
62 64
 <define-tag package-osx-stable whitespace=delete>dist/osx/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag>
63 65
 <define-tag package-osx-alpha whitespace=delete>dist/osx/Tor-<version-osx-alpha>-i386-Bundle.dmg</define-tag>
64 66
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+include $(WMLBASE)/Makefile.common
0 2
similarity index 91%
1 3
rename from projects/en/torbutton.wml
2 4
rename to torbutton/en/index.wml
... ...
@@ -6,8 +6,7 @@
6 6
 <div id="content" class="clearfix">
7 7
 	<div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page projects/projects>">Projects &raquo; </a>
10
-    <a href="<page projects/torbutton>">TorButton</a>
9
+    <a href="<page torbutton>">TorButton</a>
11 10
   </div>
12 11
 	<div id="maincol"> 
13 12
     <!-- PUT CONTENT AFTER THIS TAG -->
... ...
@@ -112,8 +111,8 @@
112 111
     href="https://gitweb.torproject.org/torbutton.git">browse the
113 112
     repository</a> or simply unzip the xpi.
114 113
     <br/>
115
-    <strong>Bug Reports:</strong> <a href="https://bugs.torproject.org/flyspray/index.php?tasks=all&amp;project=5">Torproject flyspray</a><br/>
116
-    <strong>Documents:</strong> <b>[</b> <a href="<page projects/torbutton-faq>">FAQ</a> <b>|</b>
114
+    <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/">Torproject Bug Tracker</a><br/>
115
+    <strong>Documents:</strong> <b>[</b> <a href="<page torbutton/torbutton-faq>">FAQ</a> <b>|</b>
117 116
     <a href="https://git.torproject.org/checkout/torbutton/master/src/CHANGELOG">changelog</a> <b>|</b>
118 117
     <a href="https://git.torproject.org/checkout/torbutton/master/src/LICENSE">license</a> <b>|</b>
119 118
     <a href="https://git.torproject.org/checkout/torbutton/master/src/CREDITS">credits</a> <b>]</b><br/>
... ...
@@ -131,8 +130,8 @@
131 130
     
132 131
     <p>
133 132
     To keep you safe, Torbutton disables many types of active content. You
134
-    can learn more from the <a href="<page projects/torbutton-faq>">Torbutton FAQ</a>,
135
-    or read more details in the <a href="<page projects/torbutton-options>">Torbutton
133
+    can learn more from the <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a>,
134
+    or read more details in the <a href="<page torbutton/torbutton-options>">Torbutton
136 135
     options</a> list.
137 136
     </p>
138 137
     
139 138
similarity index 89%
140 139
rename from projects/en/torbutton-faq.wml
141 140
rename to torbutton/en/torbutton-faq.wml
... ...
@@ -6,9 +6,8 @@
6 6
 <div id="content" class="clearfix">
7 7
 	<div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page projects/projects>">Projects &raquo; </a>
10
-    <a href="<page projects/torbutton>">TorButton &raquo; </a>
11
-    <a href="<page projects/torbutton-faq>">TorButton FAQ</a>
9
+    <a href="<page torbutton/>">TorButton &raquo; </a>
10
+    <a href="<page torbutton/torbutton-faq>">TorButton FAQ</a>
12 11
   </div>
13 12
 	<div id="maincol">  
14 13
     <!-- PUT CONTENT AFTER THIS TAG -->
... ...
@@ -19,16 +18,16 @@
19 18
     <h3>Questions</h3>
20 19
     <br />
21 20
     <ul>
22
-    <li><a href="<page projects/torbutton-faq>#nojavascript">When I toggle Tor, my sites that use javascript stop working. Why?</a></li>
23
-    <li><a href="<page projects/torbutton-faq>#noreloads">I can't click on links or hit reload after I toggle Tor! Why?</a></li>
24
-    <li><a href="<page projects/torbutton-faq>#noflash">I can't view videos on YouTube and other flash-based sites. Why?</a></li>
25
-    <li><a href="<page projects/torbutton-faq>#oldtorbutton">Torbutton sure seems to do a lot of things, some of which I find annoying. Can't I just use the old version?</a></li>
26
-    <li><a href="<page projects/torbutton-faq>#weirdstate">My browser is in some weird state where nothing works right!</a></li>
27
-    <li><a href="<page projects/torbutton-faq>#noautocomplete">When I use Tor, Firefox is no longer filling in logins/search boxes for me. Why?</a></li>
28
-    <li><a href="<page projects/torbutton-faq>#thunderbird">What about Thunderbird support? I see a page, but it is the wrong version?</a></li>
29
-    <li><a href="<page projects/torbutton-faq>#extensionconflicts">Which Firefox extensions should I avoid using?</a></li>
30
-    <li><a href="<page projects/torbutton-faq>#recommendedextensions">Which Firefox extensions do you recommend?</a></li>
31
-    <li><a href="<page projects/torbutton-faq>#securityissues">Are there any other issues I should be concerned about?</a></li>
21
+    <li><a href="<page torbutton/torbutton-faq>#nojavascript">When I toggle Tor, my sites that use javascript stop working. Why?</a></li>
22
+    <li><a href="<page torbutton/torbutton-faq>#noreloads">I can't click on links or hit reload after I toggle Tor! Why?</a></li>
23
+    <li><a href="<page torbutton/torbutton-faq>#noflash">I can't view videos on YouTube and other flash-based sites. Why?</a></li>
24
+    <li><a href="<page torbutton/torbutton-faq>#oldtorbutton">Torbutton sure seems to do a lot of things, some of which I find annoying. Can't I just use the old version?</a></li>
25
+    <li><a href="<page torbutton/torbutton-faq>#weirdstate">My browser is in some weird state where nothing works right!</a></li>
26
+    <li><a href="<page torbutton/torbutton-faq>#noautocomplete">When I use Tor, Firefox is no longer filling in logins/search boxes for me. Why?</a></li>
27
+    <li><a href="<page torbutton/torbutton-faq>#thunderbird">What about Thunderbird support? I see a page, but it is the wrong version?</a></li>
28
+    <li><a href="<page torbutton/torbutton-faq>#extensionconflicts">Which Firefox extensions should I avoid using?</a></li>
29
+    <li><a href="<page torbutton/torbutton-faq>#recommendedextensions">Which Firefox extensions do you recommend?</a></li>
30
+    <li><a href="<page torbutton/torbutton-faq>#securityissues">Are there any other issues I should be concerned about?</a></li>
32 31
     </ul>
33 32
     <br />
34 33
     
... ...
@@ -81,9 +80,8 @@
81 80
     href="http://forums.sun.com/thread.jspa?threadID=5162138&amp;messageID=9618376">local
82 81
     IP address</a>, and <a
83 82
     href="http://epic.org/privacy/cookies/flash.html">storing their own
84
-    cookies</a>. It is possible to use a LiveCD or VMWare-based solution such as
85
-    <a href="<page projects/torvm>">Tor VM</a> or <a
86
-    href="https://amnesia.boum.org/">The (Amnesic) Incognito Live System</a> that creates a
83
+    cookies</a>. It is possible to use a LiveCD solution such as
84
+    or <a href="https://amnesia.boum.org/">The (Amnesic) Incognito Live System</a> that creates a
87 85
     secure, transparent proxy to protect you from proxy bypass, however issues
88 86
     with local IP address discovery and Flash cookies still remain.  </p>
89 87
     
... ...
@@ -126,7 +124,7 @@
126 124
     href="design/index.html#attacks">Adversary
127 125
     Capabilities - Attacks</a> subsection. If there are any specific Torbutton
128 126
     behaviors that you do not like, please file a bug on <a
129
-    href="https://bugs.torproject.org/flyspray/index.php?tasks=all&amp;project=5">the
127
+    href="https://trac.torproject.org/">the
130 128
     bug tracker.</a> Most of Torbutton's security features can also be disabled via
131 129
     its preferences, if you think you have your own protection for those specific
132 130
     cases.
... ...
@@ -142,8 +140,7 @@
142 140
     Defaults'. This should reset the extension and Firefox to a known good
143 141
     configuration.  If you can manage to reproduce whatever issue gets your
144 142
     Firefox wedged, please file details at <a
145
-    href="https://bugs.torproject.org/flyspray/index.php?tasks=all&amp;project=5">the
146
-    bug tracker</a>.
143
+    href="https://trac.torproject.org/">the bug tracker</a>.
147 144
     </p>
148 145
     
149 146
     <a id="noautocomplete"></a>
150 147
similarity index 100%
151 148
rename from projects/en/torbutton-options.wml
152 149
rename to torbutton/en/torbutton-options.wml