Browse code

update all versions of tor browser bundle to the 2.2.x series with firefox 6. update the torbrowser page to reflect this too.

Erinn Clark authored on01/09/2011 04:34:55
Showing3 changed files
... ...
@@ -121,13 +121,20 @@
121 121
 <!-- TOR BROWSER BUNDLE -->
122 122
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
123 123
 	  <form class="downloads">
124
-	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (Beta)</span></a>
124
+	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (32-bit Beta)</span></a>
125 125
 	    <select name="language" id="osx-tbb" class="lang">
126 126
 #include <lang.wmi>
127 127
 	    </select>
128 128
 	    <div class="sig">
129 129
 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
130 130
 	    </div>
131
+	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (64-bit Beta)</span></a>
132
+	    <select name="language" id="osx-tbb" class="lang">
133
+#include <lang.wmi>
134
+	    </select>
135
+	    <div class="sig">
136
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
137
+	    </div>
131 138
 	    <a href="<page projects/torbrowser-details>#build">Source Code</a>
132 139
 	  </form>
133 140
 
... ...
@@ -23,34 +23,30 @@
23 23
 <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.32</define-tag>
24 24
 <define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.32</define-tag>
25 25
 
26
-<define-tag version-torbrowserbundle whitespace=delete>1.3.28</define-tag>
26
+<define-tag version-torbrowserbundle whitespace=delete>2.2.32-2</define-tag>
27 27
 <define-tag version-torbrowser-tor whitespace=delete>0.2.2.32</define-tag>
28
-<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.13-stable, zlib-1.2.5, openssl-1.0.0d</define-tag>
29
-<define-tag version-torbrowser-firefox whitespace=delete>3.6.20</define-tag>
30
-<define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
31
-<define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
28
+<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0d</define-tag>
29
+<define-tag version-torbrowser-firefox whitespace=delete>6.0.1</define-tag>
30
+<define-tag version-torbrowser-torbutton whitespace=delete>1.4.1</define-tag>
32 31
 <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag>
33 32
 <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
34 33
 <define-tag version-torbrowser-vidalia whitespace=delete>0.2.14</define-tag>
35 34
 <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag>
36 35
 
37
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.14</define-tag>
38
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.14</define-tag>
36
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.32-2</define-tag>
37
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.32-2</define-tag>
39 38
 <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.32</define-tag>
40
-<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.13, zlib-1.2.5, openssl-0.9.8p</define-tag>
41
-<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.20</define-tag>
42
-<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
39
+<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-0.9.8p</define-tag>
40
+<define-tag version-gnu-torbrowser-firefox whitespace=delete>6.0.1</define-tag>
41
+<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.1</define-tag>
43 42
 <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.14</define-tag>
44 43
 
45
-<define-tag version-torbrowserbundleosx whitespace=delete>1.0.24</define-tag>
44
+<define-tag version-torbrowserbundleosx whitespace=delete>2.2.32-2</define-tag>
46 45
 <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.32</define-tag>
47
-<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.20</define-tag>
48
-<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
49
-<define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
46
+<define-tag version-osx-torbrowser-firefox whitespace=delete>6.0.1</define-tag>
47
+<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.1</define-tag>
50 48
 <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.14</define-tag>
51 49
 
52
-<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.32-1</define-tag>
53
-
54 50
 <define-tag version-vidalia-stable whitespace=delete>0.2.14</define-tag>
55 51
 
56 52
 <define-tag version-androidbundle-tor whitespace=delete>0.2.2.25-alpha</define-tag>
... ...
@@ -95,50 +95,82 @@ The Tor IM Browser Bundle has been <a href="https://blog.torproject.org/blog/tor
95 95
 
96 96
     <p id="Download-torbrowserbundleosx" style="font-size: 120%; margin: 5mm">BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox (version
97 97
 <version-torbrowserbundleosx>, 28 MB)</p>
98
+
99
+
100
+<li>English (en-US): <a
101
+href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">32-bit</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc" style="font-size: 90%;">sig</a>) | <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz">64-bit</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz.asc" style="font-size: 90%;">sig</a>)</li>
98 102
  
99 103
     <ul>
100
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">English (en-US)</a> 
101
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li>
102
- 
103
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;
104
-(ar)</a> 
105
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>)</li>
104
+    <li>English (en-US): <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">32-bit</a> 
105
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>)
106
+ <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip">64-bit</a>
107
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li>
106 108
 
107
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip">Deutsch (de)</a> 
108
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>)</li>
109
+    <li>&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">32-bit</a> 
110
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>) <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip">64-bit</a>
111
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip.asc" style="font-size: 90%;">signature</a>)</li>
109 112
 
110
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c;
111
-(es-ES)</a> 
112
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>)</li>
113
+    <li>Deutsch (de):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip">32-bit</a> 
114
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>)
115
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip">64-bit</a>
116
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip.asc" style="font-size: 90%;">signature</a>)</li>
113 117
 
114
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> 
115
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>)</li>
118
+    <li>&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip">32-bit</a> 
119
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>)
120
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip">64-bit</a>
121
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip.asc" style="font-size: 90%;">signature</a>)
122
+</li>
116 123
 
117
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</a> 
118
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>)</li>
124
+    <li>&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip">32-bit</a> 
125
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>)
126
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip">64-bit</a>
127
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip.asc" style="font-size: 90%;">signature</a>)
128
+</li>
119 129
 
120
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip">Italiano (it)</a> 
121
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>)</li>
130
+    <li>&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">32-bit</a> 
131
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>)
132
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip">64-bit</a>
133
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip.asc" style="font-size: 90%;">signature</a>)
134
+</li>
122 135
 
123
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip">Nederlands (nl)</a> 
124
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>)</li>
125
- 
126
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip">Polish (pl)</a> 
127
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>)</li>
136
+    <li>Italiano (it):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip">32-bit</a> 
137
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>)
138
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip">64-bit</a>
139
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip.asc" style="font-size: 90%;">signature</a>)
128 140
 
129
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-PT)</a> 
130
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>)</li>
141
+</li>
131 142
 
132
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;
133
-(ru)</a> 
134
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>)</li>
143
+    <li>Nederlands (nl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip">32-bit</a> 
144
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>)
145
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip">64-bit</a>
146
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip.asc" style="font-size: 90%;">signature</a>)
147
+</li>
148
+ 
149
+    <li>Polish (pl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip">32-bit</a> 
150
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>)
151
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip">64-bit</a>
152
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip.asc" style="font-size: 90%;">signature</a>)
153
+</li>
135 154
 
136
-    <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> 
137
-    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>)</li>
155
+    <li>&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-PT):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip">32-bit</a> 
156
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>)
157
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip">64-bit</a>
158
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip.asc" style="font-size: 90%;">signature</a>)
159
+</li>
138 160
 
139
-    </ul>
161
+    <li>&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip">32-bit</a> 
162
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>)
163
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip">64-bit</a>
164
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip.asc" style="font-size: 90%;">signature</a>)
165
+</li>
140 166
 
167
+    <li>&#x7b80;&#x4f53;&#x5b57; (zh-CN):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip">32-bit</a> 
168
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>)
169
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip">64-bit</a>
170
+    (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip.asc" style="font-size: 90%;">signature</a>)
171
+</li>
141 172
 
173
+    </ul>
142 174
     
143 175
     <p id="Download-torbrowserbundlelinux" style="font-size: 120%; margin: 5mm">BETA: Tor Browser Bundle for Linux with Firefox (version <version-torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> (64-bit), 24 MB)</p>
144 176
     
... ...
@@ -285,11 +317,11 @@ Pidgin" /></p>
285 317
     website</a>.</p>
286 318
     
287 319
     <p><strong>What is in the Tor Browser Bundle?</strong> It
288
-    contains Tor, Vidalia, Polipo, Firefox, and Torbutton (<a
320
+    contains Tor, Vidalia, Firefox, and Torbutton (<a
289 321
     href="<page projects/torbrowser-details>#contents">learn more</a>).</p>
290 322
     
291 323
     <p><strong>What is in the Tor IM Browser Bundle?</strong> It
292
-    contains Tor, Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a
324
+    contains Tor, Vidalia, Firefox, Torbutton, Pidgin and OTR (<a
293 325
     href="<page projects/torbrowser-details>#contents">learn more</a>).</p>
294 326
     
295 327
     <p><strong>How can I make my own bundle?</strong> To download