Browse code

copy all of the images over from trunk, update versions, update the docs sidenav to name the manual pages correctly, clean up download.wml so it actually works correctly.

Andrew Lewman authored on 05/10/2010 23:12:37
Showing 86 changed files
... ...
@@ -50,17 +50,17 @@
50 50
            'txt'  => 'Configuring a Mirror',
51 51
           },
52 52
           {'url'  => 'docs/tor-manual',
53
-           'txt'  => 'Tor Manual',
53
+           'txt'  => 'Tor -stable Manual',
54 54
           },
55 55
           {'url'  => 'docs/tor-manual-dev',
56
-           'txt'  => 'Tor Developer Manual',
56
+           'txt'  => 'Tor -alpha Manual',
57 57
           }],
58 58
       },
59 59
       {'url' => 'docs/glossary',
60 60
        'txt' => 'Glossary',
61 61
       },
62 62
       {
63
-       'url'  => 'http://wiki.torproject.org',
63
+       'url'  => '<wiki>',
64 64
        'txt'  => 'Tor Wiki',
65 65
       }, 
66 66
       {'url'  => 'docs/faq',
... ...
@@ -19,10 +19,7 @@
19 19
           	<td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle</a></div></td>
20 20
           </tr>
21 21
         	<tr>
22
-		      <td class="intro" colspan="4">The Tor Browser
23
-		      Bundle contains Tor, Vidalia, Torbutton, Polipo, and
24
-		      Firefox. This package requires no installation. Just
25
-		      extract it and run.</td>
22
+		      <td class="intro" colspan="4">The Tor Browser Bundle contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.</td>
26 23
           </tr>
27 24
           <tr>
28 25
           	<td><span class="column-title">Language</span></td>
... ...
@@ -39,7 +36,13 @@
39 36
           <tr>
40 37
             <td>English (en-US)</td>
41 38
             <td><version-torbrowserbundlelinux></td>
42
-            <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
39
+            <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></span></td>
40
+            <td></td>
41
+          </tr>
42
+          <tr class="beige">
43
+            <td>English (en-US)</td>
44
+            <td><version-torbrowserbundleosx></td>
45
+            <td><span class="mac"><a href="torbrowser/dist/osx/tor-browser-<version-torbrowserbundleosx>dev-osx-i386-en-US.zip"></a></span></td>
43 46
             <td></td>
44 47
           </tr>
45 48
         </table>
... ...
@@ -60,13 +63,7 @@
60 63
                 <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
61 64
                 <td></td>
62 65
               </tr>
63
-              <tr>
64
-                <td>English (en-US)</td>
65
-                <td><version-torbrowserbundlelinux></td>
66
-                <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
67
-                <td></td>
68
-              </tr>
69
-          </tr>
66
+            </tr>
70 67
   		</table>
71 68
         <table class="topforty">
72 69
 	        <tr>
... ...
@@ -74,21 +71,21 @@
74 71
           </tr>
75 72
             <tr>
76 73
               <td><span class="column-title">Version</span></td>
77
-              <td><span class="column-title">Platform</span></td>
74
+              <td colspan="3"><span class="column-title">Platform</span></td>
78 75
               <td><span class="column-title">Source Code</span></td>
79 76
             </tr>
80 77
             <tr class="beige">
81 78
               <td><version-stable></td>
82 79
               <td><span class="windows"><a href="<package-win32-bundle-stable>">Download</a></span></td>
83 80
               <td><span class="mac"><a href="<package-osx-bundle-stable>">Download</a></span>
84
-              <td><span class="linux"><a href="<page download/download-unix/>">Unix Packages</a></span></td>
81
+              <td><span class="linux"><a href="<page download/download-unix>">Unix Repositories</a></span></td>
85 82
               <td><a href="<package-source-stable>">Download Tarball</a></td>
86 83
           	</tr>
87 84
             <tr>
88 85
               <td><version-alpha></td>
89 86
               <td><span class="windows"><a href="<package-win32-bundle-alpha>">Download</a></span></td>
90 87
               <td><span class="mac"><a href="<package-osx-bundle-alpha>">Download</a></span>
91
-              <td><span class="linux"><a href="<page download/download-unix>">Unix Packages</a></span></td>
88
+              <td><span class="linux"><a href="<page download/download-unix>">Unix Repositories</a></span></td>
92 89
               <td><a href="<package-source-alpha>">Download Tarball</a></td>
93 90
           	</tr>
94 91
         </table>
... ...
@@ -103,16 +100,13 @@
103 100
               <td><span class="column-title">Installation Guide</span></td>
104 101
             </tr>
105 102
             <tr class="beige">
106
-              <td>Android</td>
107
-              <td></td>
108
-              <td><package-androidbundle-alpha></td>
103
+              <td colspan="2">Android-based phones, tablets, computers</td>
104
+              <td><a href="dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk"><version-androidbundle-tor></td>
109 105
               <td><a href="<page docs/android>">Instructions</a></td>
110 106
           	</tr>
111 107
             <tr>
112
-              <td>iPhone, iPod Touch, iPad</td>
113
-              <td></td>
114
-              <td><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></span></td>
115
-              <td></td>
108
+              <td colspan="2">iPhone, iPod Touch, iPad</td>
109
+              <td colspan="2"><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></span></td>
116 110
           	</tr>
117 111
           	<tr class="beige">
118 112
               <td>Nokia Maemo/N900</td>
... ...
@@ -135,37 +129,35 @@
135 129
               <tr class="beige">
136 130
                 <td><span class="windows">Windows</span></td>
137 131
                 <td>Windows 7, Vista, XP, 2000, 2003 Server</td>
138
-                <td><a href="#">1.3.4</a></td>
139
-                <td><a href="#">1.3.6</a></td>
140
-                <td><a href="#">Windows</a></td>
132
+                <td><a href="/dist/win32/tor-<version-win32-stable>-win32.exe"<version-win32-stable></a></td>
133
+                <td><a href="/dist/win32/tor-<version-win32-alpha>-win32.exe"><version-win32-alpha></a></td>
134
+                <td><a href="<page docs/tor-doc-windows>">Windows</a></td>
141 135
               </tr>
142 136
               <tr>
143 137
                 <td><span class="mac">Mac (Intel)</span></td>
144 138
                 <td>Intel only</td>
145
-                <td><a href="#">1.3.4</a></td>
146
-                <td><a href="#">1.3.6</a></td>
147
-                <td><a href="#">Mac (Intel)</a></td>
139
+                <td><a href="/dist/osx/Tor-<version-osx-stable>-i386-Bundle.dmg"><version-osx-stable></a></td>
140
+                <td><a href="/dist/osx/Tor-<version-osx-alpha>-i386-Bundle.dmg"></a><version-osx-alpha></td>
141
+                <td><a href="<page docs/tor-doc-osx>">Mac (Intel)</a></td>
148 142
               </tr>
149 143
               <tr class="beige">
150 144
                 <td><span class="mac">Mac (Power PC)</span></td>
151 145
                 <td>Intel only</td>
152
-                <td><a href="#">1.3.4</a></td>
153
-                <td><a href="#">1.3.6</a></td>
154
-                <td><a href="#">Mac (Power PC)</a></td>
146
+                <td><a href="/dist/osx-old/Tor-<version-oldosx-stable>-ppc-Bundle.dmg"><version-oldosx-stable></a></td>
147
+                <td><a href="dist/osx-old/Tor-<version-oldosx-alpha>-ppc-Bundle.dmg"><version-oldosx-alpha></a></td>
148
+                <td><a href="<page docs/tor-doc-osx>">Mac (Power PC)</a></td>
155 149
               </tr>
156 150
               <tr>
157 151
                 <td><span class="linux">Linux/Unix</span></td>
158 152
                 <td>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</td>
159
-                <td><a href="#">1.3.4</a></td>
160
-                <td><a href="#">1.3.6</a></td>
161
-                <td><a href="#">Linux/Unix</a></td>
153
+                <td colspan="2">Read how to use <a href="<page download/download-unix>">our repositories</a>.</td>
154
+                <td><a href="<page download/download-unix>">Linux/Unix</a></td>
162 155
               </tr>
163 156
               <tr class="beige">
164 157
                 <td>Source Tarballs</td>
165
-                <td>./configure && make && src/or/tor  </td>
166
-                <td><a href="#">1.3.4</a></td>
167
-                <td>&nbsp;</td>
168
-                <td><a href="#">Source Tarballs</a></td>
158
+                <td>./configure && make && src/or/tor</td>
159
+                <td><a href="/dist/tor-<version-stable>.tar.gz"><version-stable></a></td>
160
+                <td><a href="/dist/tor-<version-alpha>.tar.gz"><version-alpha></a></td>
169 161
               </tr>
170 162
         </table>
171 163
 
... ...
@@ -246,7 +238,7 @@ all the issues</a>.
246 238
           	<ul>
247 239
             	<li class="dropdown"><a href="#wim">TorBrowser with Instant Messenger Client</a></li>
248 240
             	<li class="dropdown"><a href="#tbb">TorBrowser Bundles</a></li>
249
-            	<li class="dropdown"><a href="#tor">Tor Bundles</a></li>
241
+            	<li class="dropdown"><a href="#tor">Vidalia Bundles</a></li>
250 242
             	<li class="dropdown"><a href="#smartphones">Tor for Smartphones</a></li>
251 243
             	<li class="dropdown"><a href="#expert">Expert Packages</a></li>
252 244
             </ul>
... ...
@@ -256,11 +248,9 @@ all the issues</a>.
256 248
         <div class="img-shadow">
257 249
           <div class="infoblock">
258 250
           	<h2>Verify Signatures</h2>
259
-            <p>Blurb about why you should verify the signatures before you download software off the internet.</p>
260
-						<p><a href="#">Tor Bundle for Windows</a><br />
261
-					    <a href="#">TorBrowser Bundle for Windows</a><br />
262
-				      <a href="#">Tor Bundle for Mac</a><br />
263
-			        <a href="#">Tor Bundle for Linux/Unix</a></p>
251
+            <p>Verify your downloads with our PGP signatures:</p>
252
+            <a href="<page docs/verifying-signatures>">Read how to
253
+verify the signatures</a>.
264 254
           </div>
265 255
         </div>
266 256
         <!-- END INFOBLOCK -->
... ...
@@ -278,12 +268,6 @@ all the issues</a>.
278 268
           </div>
279 269
       	</div>
280 270
         <!-- END SIDENAV -->
281
-        <div class="img-shadow">
282
-        	<div class="infoblock">
283
-          	<h2>Disclaimers</h2>
284
-            <p>Blurb about how Tor wants to do right by its users, and list of things user should be aware of, like how if they download the TorBrowser and then use Internet Explorer, that they are not being adequately protected. You can use this space to advocate for knowledge about online security to augment Tor.</p>
285
-          </div>
286
-        </div>
287 271
       </div>
288 272
       <!-- END SIDECOL -->
289 273
     </div>
290 274
new file mode 100644
291 275
Binary files /dev/null and b/images/2008-expenses-chart.png differ
292 276
new file mode 100644
293 277
Binary files /dev/null and b/images/2008-funding-chart.png differ
294 278
new file mode 100644
295 279
Binary files /dev/null and b/images/THS-1.png differ
296 280
new file mode 100644
297 281
Binary files /dev/null and b/images/THS-2.png differ
298 282
new file mode 100644
299 283
Binary files /dev/null and b/images/THS-3.png differ
300 284
new file mode 100644
301 285
Binary files /dev/null and b/images/THS-4.png differ
302 286
new file mode 100644
303 287
Binary files /dev/null and b/images/THS-5.png differ
304 288
new file mode 100644
305 289
Binary files /dev/null and b/images/THS-6.png differ
306 290
new file mode 100644
307 291
Binary files /dev/null and b/images/beige_medium_donate_withmsg_whitebg.gif differ
308 292
new file mode 100644
309 293
Binary files /dev/null and b/images/btn_donateCC_LG.gif differ
310 294
new file mode 100644
311 295
Binary files /dev/null and b/images/cc-by-us-80x15.png differ
312 296
new file mode 100644
313 297
Binary files /dev/null and b/images/curve.gif differ
314 298
new file mode 100644
315 299
Binary files /dev/null and b/images/de.png differ
316 300
new file mode 100644
317 301
Binary files /dev/null and b/images/download_tor.png differ
318 302
new file mode 100644
319 303
Binary files /dev/null and b/images/eff_badge.png differ
320 304
new file mode 100644
321 305
Binary files /dev/null and b/images/en.png differ
322 306
new file mode 100644
323 307
Binary files /dev/null and b/images/es.png differ
324 308
new file mode 100644
325 309
Binary files /dev/null and b/images/fa.png differ
326 310
new file mode 100644
327 311
Binary files /dev/null and b/images/fi.png differ
328 312
new file mode 100644
329 313
Binary files /dev/null and b/images/fr.png differ
330 314
new file mode 100644
331 315
Binary files /dev/null and b/images/golden_medium_donate_withmsg_whitebg.gif differ
332 316
new file mode 100644
333 317
Binary files /dev/null and b/images/green-flagspace.png differ
334 318
new file mode 100644
335 319
Binary files /dev/null and b/images/how_tor_works_thumb.png differ
336 320
new file mode 100644
337 321
Binary files /dev/null and b/images/how_tor_works_thumb_es.png differ
338 322
new file mode 100644
339 323
Binary files /dev/null and b/images/how_tor_works_thumb_zh.png differ
340 324
new file mode 100644
341 325
Binary files /dev/null and b/images/htw1_de.png differ
342 326
new file mode 100644
343 327
Binary files /dev/null and b/images/htw1_es.png differ
344 328
new file mode 100644
345 329
Binary files /dev/null and b/images/htw1_fr.png differ
346 330
new file mode 100644
347 331
Binary files /dev/null and b/images/htw1_ja.png differ
348 332
new file mode 100644
349 333
Binary files /dev/null and b/images/htw1_nl.png differ
350 334
new file mode 100644
351 335
Binary files /dev/null and b/images/htw1_no.png differ
352 336
new file mode 100644
353 337
Binary files /dev/null and b/images/htw1_pl.png differ
354 338
new file mode 100644
355 339
Binary files /dev/null and b/images/htw1_ru.png differ
356 340
new file mode 100644
357 341
Binary files /dev/null and b/images/htw1_zh.jpg differ
358 342
new file mode 100644
359 343
Binary files /dev/null and b/images/htw1_zh.png differ
360 344
new file mode 100644
361 345
Binary files /dev/null and b/images/htw2_de.png differ
362 346
new file mode 100644
363 347
Binary files /dev/null and b/images/htw2_es.png differ
364 348
new file mode 100644
365 349
Binary files /dev/null and b/images/htw2_fr.png differ
366 350
new file mode 100644
367 351
Binary files /dev/null and b/images/htw2_ja.png differ
368 352
new file mode 100644
369 353
Binary files /dev/null and b/images/htw2_nl.png differ
370 354
new file mode 100644
371 355
Binary files /dev/null and b/images/htw2_no.png differ
372 356
new file mode 100644
373 357
Binary files /dev/null and b/images/htw2_pl.png differ
374 358
new file mode 100644
375 359
Binary files /dev/null and b/images/htw2_ru.png differ
376 360
new file mode 100644
377 361
Binary files /dev/null and b/images/htw2_zh.jpg differ
378 362
new file mode 100644
379 363
Binary files /dev/null and b/images/htw2_zh.png differ
380 364
new file mode 100644
381 365
Binary files /dev/null and b/images/htw3_de.png differ
382 366
new file mode 100644
383 367
Binary files /dev/null and b/images/htw3_es.png differ
384 368
new file mode 100644
385 369
Binary files /dev/null and b/images/htw3_fr.png differ
386 370
new file mode 100644
387 371
Binary files /dev/null and b/images/htw3_ja.png differ
388 372
new file mode 100644
389 373
Binary files /dev/null and b/images/htw3_nl.png differ
390 374
new file mode 100644
391 375
Binary files /dev/null and b/images/htw3_no.png differ
392 376
new file mode 100644
393 377
Binary files /dev/null and b/images/htw3_pl.png differ
394 378
new file mode 100644
395 379
Binary files /dev/null and b/images/htw3_ru.png differ
396 380
new file mode 100644
397 381
Binary files /dev/null and b/images/htw3_zh.jpg differ
398 382
new file mode 100644
399 383
Binary files /dev/null and b/images/htw3_zh.png differ
400 384
new file mode 100644
401 385
Binary files /dev/null and b/images/ico-osx-uni.png differ
402 386
new file mode 100644
403 387
Binary files /dev/null and b/images/ico-tux.png differ
404 388
new file mode 100644
405 389
Binary files /dev/null and b/images/ico-win.png differ
406 390
new file mode 100644
407 391
Binary files /dev/null and b/images/it.png differ
408 392
new file mode 100644
409 393
Binary files /dev/null and b/images/ja.png differ
410 394
new file mode 100644
411 395
Binary files /dev/null and b/images/ko.png differ
412 396
new file mode 100644
413 397
Binary files /dev/null and b/images/logo.windows-header.gif differ
414 398
new file mode 100644
415 399
Binary files /dev/null and b/images/medium-res-sticker-logo.png differ
416 400
new file mode 100644
417 401
Binary files /dev/null and b/images/nl.png differ
418 402
new file mode 100644
419 403
Binary files /dev/null and b/images/nlnet-160x60.png differ
420 404
new file mode 100644
421 405
Binary files /dev/null and b/images/no.png differ
422 406
new file mode 100644
423 407
Binary files /dev/null and b/images/onr-logo.jpg differ
424 408
new file mode 100644
425 409
Binary files /dev/null and b/images/pl.png differ
426 410
new file mode 100644
427 411
Binary files /dev/null and b/images/pt.png differ
428 412
new file mode 100644
429 413
Binary files /dev/null and b/images/ref_leopard_box.jpg differ
430 414
new file mode 100644
431 415
Binary files /dev/null and b/images/ru.png differ
432 416
new file mode 100644
433 417
Binary files /dev/null and b/images/se.png differ
434 418
new file mode 100644
435 419
Binary files /dev/null and b/images/spacer.png differ
436 420
new file mode 100644
437 421
Binary files /dev/null and b/images/top-left.png differ
438 422
new file mode 100644
439 423
Binary files /dev/null and b/images/top-middle.png differ
440 424
new file mode 100644
441 425
Binary files /dev/null and b/images/top-right.png differ
442 426
new file mode 100644
443 427
Binary files /dev/null and b/images/tor-button.png differ
444 428
new file mode 100644
445 429
Binary files /dev/null and b/images/tor_mast.gif differ
446 430
new file mode 100644
447 431
Binary files /dev/null and b/images/tor_mast.png differ
448 432
new file mode 100644
449 433
Binary files /dev/null and b/images/tr.png differ
450 434
new file mode 100644
451 435
Binary files /dev/null and b/images/vidalia-bridges-setup.png differ
452 436
new file mode 100644
453 437
Binary files /dev/null and b/images/vidalia-bridges.png differ
454 438
new file mode 100644
455 439
Binary files /dev/null and b/images/zh-cn.png differ
... ...
@@ -1,47 +1,55 @@
1 1
 <define-tag version-stable whitespace=delete>0.2.1.26</define-tag>
2
-<define-tag version-alpha whitespace=delete>0.2.2.14-alpha</define-tag>
2
+<define-tag version-alpha whitespace=delete>0.2.2.17-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.14-alpha</define-tag>
5
+<define-tag version-win32-alpha whitespace=delete>0.2.2.17-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.14-alpha</define-tag>
8
+<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.17-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.14-alpha</define-tag>
11
+<define-tag version-osx-bundle-alpha whitespace=delete>0.2.2.16-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.14-alpha</define-tag>
14
+<define-tag version-oldosx-bundle-alpha whitespace=delete>0.2.2.15-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.14-alpha</define-tag>
17
+<define-tag version-osx-alpha whitespace=delete>0.2.2.16-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.14-alpha</define-tag>
20
+<define-tag version-oldosx-alpha whitespace=delete>0.2.2.15-alpha</define-tag>
21 21
 
22
-<define-tag version-torbrowserbundle whitespace=delete>1.3.9</define-tag>
22
+<define-tag version-torbrowserbundle whitespace=delete>1.3.10</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.11</define-tag>
25
+<define-tag version-torbrowser-firefox whitespace=delete>3.6.10</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.7.2</define-tag>
28
+<define-tag version-torbrowser-pidgin whitespace=delete>2.7.3</define-tag>
29 29
 <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
30
-<define-tag version-torbrowser-vidalia whitespace=delete>0.2.9</define-tag>
31
-<define-tag version-torimbrowserbundle whitespace=delete>1.3.9</define-tag>
30
+<define-tag version-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>
31
+<define-tag version-torimbrowserbundle whitespace=delete>1.3.10</define-tag>
32 32
 
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>
33
+<define-tag version-torbrowserbundlelinux whitespace=delete>1.0.13</define-tag>
34
+<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.17-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.10</define-tag>
36
+<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.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
-<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.9</define-tag>
39
+<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>
40 40
 
41
-<define-tag version-vidalia-stable whitespace=delete>0.2.9</define-tag>
41
+<define-tag version-torbrowserbundleosx whitespace=delete>1.0.2</define-tag>
42
+<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.17-alpha</define-tag>
43
+<define-tag version-osx-torbrowser-tor-components whitespace=delete>libevent-1.4.13, zlib-1.2.3, openssl-0.9.8l</define-tag>
44
+<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.10</define-tag>
45
+<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
46
+<define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
47
+<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.10</define-tag>
42 48
 
43
-<define-tag version-androidbundle-tor whitespace=delete>0.2.2.13-alpha</define-tag>
44
-<define-tag version-androidbundle-orbot whitespace=delete>0.0.8</define-tag>
49
+<define-tag version-vidalia-stable whitespace=delete>0.2.10</define-tag>
50
+
51
+<define-tag version-androidbundle-tor whitespace=delete>0.2.2.14-alpha</define-tag>
52
+<define-tag version-androidbundle-orbot whitespace=delete>1.0.4</define-tag>
45 53
 <define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag>
46 54
 <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag>
47 55
 <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag>
... ...
@@ -50,13 +58,13 @@
50 58
 <define-tag package-win32-stable whitespace=delete>dist/win32/tor-<version-win32-stable>-win32.exe</define-tag>
51 59
 <define-tag package-win32-alpha whitespace=delete>dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag>
52 60
 
53
-<define-tag local-win32-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-stable>-0.2.9.exe</define-tag>
54
-<define-tag local-win32-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-alpha>-0.2.9.exe</define-tag> 
61
+<define-tag local-win32-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-stable>-0.2.10.exe</define-tag>
62
+<define-tag local-win32-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-win32-bundle-alpha>-0.2.10.exe</define-tag> 
55 63
 <define-tag package-win32-bundle-stable whitespace=delete><local-win32-bundle-stable></define-tag>
56 64
 <define-tag package-win32-bundle-alpha whitespace=delete><local-win32-bundle-alpha></define-tag>
57 65
 
58
-<define-tag package-osx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-stable>-0.2.9-i386.dmg</define-tag>
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>
66
+<define-tag package-osx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-stable>-0.2.10-i386.dmg</define-tag>
67
+<define-tag package-osx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-osx-bundle-alpha>-0.2.10-i386.dmg</define-tag>
60 68
 
61 69
 <define-tag package-oldosx-bundle-stable whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-oldosx-bundle-stable>-0.2.8-ppc.dmg</define-tag>
62 70
 <define-tag package-oldosx-bundle-alpha whitespace=delete>dist/vidalia-bundles/vidalia-bundle-<version-oldosx-bundle-alpha>-0.2.9-ppc.dmg</define-tag>
... ...
@@ -96,3 +104,6 @@
96 104
 
97 105
 <define-tag version-torbutton whitespace=delete>1.2.5 (08 April 2010)</define-tag>
98 106
 <define-tag version-hash-torbutton whitespace=delete>sha1:e84592877593ad6119e829ac7199fd19333e101e</define-tag>
107
+
108
+<define-tag version-torbutton-alpha whitespace=delete>1.3.0-alpha (30 September 2010)</define-tag>
109
+<define-tag version-hash-torbutton-alpha whitespace=delete>sha1:be60421d92a455e6e7c25ade84da19db9f299e7e</define-tag>