Browse code

update versions for TB 3.6.4 and 4.0-alpha-1 and finish updating the torbrowser page

Erinn Clark authored on12/08/2014 19:56:25
Showing2 changed files
... ...
@@ -23,11 +23,11 @@
23 23
 <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag>
24 24
 <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag>
25 25
 
26
-<define-tag version-torbrowserbundledir whitespace=delete>3.6.3</define-tag>
27
-<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.3</define-tag>
26
+<define-tag version-torbrowserbundledir whitespace=delete>3.6.4</define-tag>
27
+<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.4</define-tag>
28 28
 
29
-<define-tag version-torbrowserbundle whitespace=delete>3.6.3</define-tag>
30
-<define-tag version-torbrowserbundlebeta whitespace=delete>3.6-beta-2</define-tag>
29
+<define-tag version-torbrowserbundle whitespace=delete>3.6.4</define-tag>
30
+<define-tag version-torbrowserbundlebeta whitespace=delete>4.0-alpha-1</define-tag>
31 31
 <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
32 32
 <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag>
33 33
 <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
... ...
@@ -37,19 +37,19 @@
37 37
 <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag>
38 38
 <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag>
39 39
 
40
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.3</define-tag>
41
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.3</define-tag>
42
-<define-tag version-torbrowserbundlelinux32beta whitespace=delete>3.6-beta-2</define-tag>
43
-<define-tag version-torbrowserbundlelinux64beta whitespace=delete>3.6-beta-2</define-tag>
40
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.4</define-tag>
41
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.4</define-tag>
42
+<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.0-alpha-1</define-tag>
43
+<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.0-alpha-1</define-tag>
44 44
 <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
45 45
 <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag>
46 46
 <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
47 47
 <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
48 48
 <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag>
49 49
 
50
-<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.3</define-tag>
50
+<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.4</define-tag>
51 51
 <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag>
52
-<define-tag version-torbrowserbundleosx32beta whitespace=delete>3.6-beta-2</define-tag>
52
+<define-tag version-torbrowserbundleosx32beta whitespace=delete>4.0-alpha-1</define-tag>
53 53
 <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
54 54
 <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
55 55
 <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
... ...
@@ -89,6 +89,8 @@
89 89
     for your
90 90
     preferred language. This file can be saved wherever is convenient,
91 91
     e.g. the Desktop or a USB flash drive.</p></div>
92
+    <p></p>
93
+    <center><h3>Stable Tor Browser</h3></center>
92 94
     <div class="pjtext">
93 95
       <div class="dltable" style="margin-top: -35px;">
94 96
         <table>
... ...
@@ -299,7 +301,18 @@
299 301
           </tbody>
300 302
         </table>
301 303
       </div>
304
+      </div>
305
+<p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>,
306
+      which allows you to make sure you've downloaded the file we intended
307
+      you to get. Also, note that the Firefox ESR in our bundles is
308
+      <a href="https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/config/">modified</a> from the <a
309
+      href="https://www.mozilla.org/en-US/firefox/organizations/">default
310
+      Firefox ESR</a></p>
302 311
 <!-- alpha bundles -->
312
+<hr>
313
+    <p></p>
314
+    <center><h3>Experimental Tor Browser</h3></center>
315
+     <div class="pjtext">
303 316
       <div class="dltable" style="margin-top: -35px;">
304 317
         <table>
305 318
           <thead>
... ...
@@ -509,13 +522,7 @@
509 522
           </tbody>
510 523
         </table>
511 524
       </div>
512
-      <>
513
-      <p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>,
514
-      which allows you to make sure you've downloaded the file we intended
515
-      you to get. Also, note that the Firefox ESR in our bundles is
516
-      <a href="https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/config/">modified</a> from the <a
517
-      href="https://www.mozilla.org/en-US/firefox/organizations/">default
518
-      Firefox ESR</a></p>
525
+      </div>
519 526
     </div>
520 527
       </div>
521 528