[tor-commits] r25001: {website} update all versions of tor browser bundle to the 2.2.x serie (in website/trunk: download/en include projects/en)
Erinn Clark
erinn at torproject.org
Thu Sep 1 02:34:55 UTC 2011
Author: erinn
Date: 2011-09-01 02:34:55 +0000 (Thu, 01 Sep 2011)
New Revision: 25001
Modified:
website/trunk/download/en/download.wml
website/trunk/include/versions.wmi
website/trunk/projects/en/torbrowser.wml
Log:
update all versions of tor browser bundle to the 2.2.x series with firefox 6. update the torbrowser page to reflect this too.
Modified: website/trunk/download/en/download.wml
===================================================================
--- website/trunk/download/en/download.wml 2011-08-31 19:06:55 UTC (rev 25000)
+++ website/trunk/download/en/download.wml 2011-09-01 02:34:55 UTC (rev 25001)
@@ -121,13 +121,20 @@
<!-- TOR BROWSER BUNDLE -->
<div class="package" style="padding-top: 13px; border-top: 0px;">
<form class="downloads">
- <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>
+ <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>
<select name="language" id="osx-tbb" class="lang">
#include <lang.wmi>
</select>
<div class="sig">
(<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>
</div>
+ <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>
+ <select name="language" id="osx-tbb" class="lang">
+#include <lang.wmi>
+ </select>
+ <div class="sig">
+ (<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>
+ </div>
<a href="<page projects/torbrowser-details>#build">Source Code</a>
</form>
Modified: website/trunk/include/versions.wmi
===================================================================
--- website/trunk/include/versions.wmi 2011-08-31 19:06:55 UTC (rev 25000)
+++ website/trunk/include/versions.wmi 2011-09-01 02:34:55 UTC (rev 25001)
@@ -23,34 +23,30 @@
<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.32</define-tag>
<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.32</define-tag>
-<define-tag version-torbrowserbundle whitespace=delete>1.3.28</define-tag>
+<define-tag version-torbrowserbundle whitespace=delete>2.2.32-2</define-tag>
<define-tag version-torbrowser-tor whitespace=delete>0.2.2.32</define-tag>
-<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.13-stable, zlib-1.2.5, openssl-1.0.0d</define-tag>
-<define-tag version-torbrowser-firefox whitespace=delete>3.6.20</define-tag>
-<define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
-<define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
+<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0d</define-tag>
+<define-tag version-torbrowser-firefox whitespace=delete>6.0.1</define-tag>
+<define-tag version-torbrowser-torbutton whitespace=delete>1.4.1</define-tag>
<define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag>
<define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
<define-tag version-torbrowser-vidalia whitespace=delete>0.2.14</define-tag>
<define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag>
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.14</define-tag>
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.14</define-tag>
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.32-2</define-tag>
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.32-2</define-tag>
<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.32</define-tag>
-<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.13, zlib-1.2.5, openssl-0.9.8p</define-tag>
-<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.20</define-tag>
-<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
+<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-0.9.8p</define-tag>
+<define-tag version-gnu-torbrowser-firefox whitespace=delete>6.0.1</define-tag>
+<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.1</define-tag>
<define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.14</define-tag>
-<define-tag version-torbrowserbundleosx whitespace=delete>1.0.24</define-tag>
+<define-tag version-torbrowserbundleosx whitespace=delete>2.2.32-2</define-tag>
<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.32</define-tag>
-<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.20</define-tag>
-<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag>
-<define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag>
+<define-tag version-osx-torbrowser-firefox whitespace=delete>6.0.1</define-tag>
+<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.1</define-tag>
<define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.14</define-tag>
-<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.32-1</define-tag>
-
<define-tag version-vidalia-stable whitespace=delete>0.2.14</define-tag>
<define-tag version-androidbundle-tor whitespace=delete>0.2.2.25-alpha</define-tag>
Modified: website/trunk/projects/en/torbrowser.wml
===================================================================
--- website/trunk/projects/en/torbrowser.wml 2011-08-31 19:06:55 UTC (rev 25000)
+++ website/trunk/projects/en/torbrowser.wml 2011-09-01 02:34:55 UTC (rev 25001)
@@ -95,50 +95,82 @@
<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
<version-torbrowserbundleosx>, 28 MB)</p>
+
+
+<li>English (en-US): <a
+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>
<ul>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">English (en-US)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li>
-
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">العربية
-(ar)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>English (en-US): <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc" style="font-size: 90%;">signature</a>)
+ <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-en-US.zip.asc" style="font-size: 90%;">signature</a>)</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip">Deutsch (de)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>العربية (ar):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">32-bit</a>
+ (<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>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ar.zip.asc" style="font-size: 90%;">signature</a>)</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip">Español
-(es-ES)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>Deutsch (de):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-de.zip.asc" style="font-size: 90%;">signature</a>)</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip">فارسی (fa) </a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>Español (es-ES):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-es-ES.zip.asc" style="font-size: 90%;">signature</a>)
+</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">Français (fr)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>فارسی (fa):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fa.zip.asc" style="font-size: 90%;">signature</a>)
+</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip">Italiano (it)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>Français (fr):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-fr.zip.asc" style="font-size: 90%;">signature</a>)
+</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip">Nederlands (nl)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>Italiano (it):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-it.zip.asc" style="font-size: 90%;">signature</a>)
+
+</li>
+
+ <li>Nederlands (nl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-nl.zip.asc" style="font-size: 90%;">signature</a>)
+</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip">Polish (pl)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>Polish (pl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pl.zip.asc" style="font-size: 90%;">signature</a>)
+</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip">Português (pt-PT)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>Português (pt-PT):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-pt-PT.zip.asc" style="font-size: 90%;">signature</a>)
+</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip">Русский
-(ru)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>Русский (ru):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-ru.zip.asc" style="font-size: 90%;">signature</a>)
+</li>
- <li><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip">简体字 (zh-CN)</a>
- (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>)</li>
+ <li>简体字 (zh-CN):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip">32-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc" style="font-size: 90%;">signature</a>)
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip">64-bit</a>
+ (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-zh-CN.zip.asc" style="font-size: 90%;">signature</a>)
+</li>
</ul>
-
-
<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>
@@ -285,11 +317,11 @@
website</a>.</p>
<p><strong>What is in the Tor Browser Bundle?</strong> It
- contains Tor, Vidalia, Polipo, Firefox, and Torbutton (<a
+ contains Tor, Vidalia, Firefox, and Torbutton (<a
href="<page projects/torbrowser-details>#contents">learn more</a>).</p>
<p><strong>What is in the Tor IM Browser Bundle?</strong> It
- contains Tor, Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a
+ contains Tor, Vidalia, Firefox, Torbutton, Pidgin and OTR (<a
href="<page projects/torbrowser-details>#contents">learn more</a>).</p>
<p><strong>How can I make my own bundle?</strong> To download
More information about the tor-commits
mailing list