[tor-commits] r26487: {website} update the website for the big TBB 3.x release! (in website/trunk: download/en include projects/en)

Erinn Clark erinn at torproject.org
Thu Dec 19 00:10:44 UTC 2013


Author: erinn
Date: 2013-12-19 00:10:44 +0000 (Thu, 19 Dec 2013)
New Revision: 26487

Modified:
   website/trunk/download/en/download-easy.wml
   website/trunk/download/en/download.wml
   website/trunk/include/versions.wmi
   website/trunk/projects/en/torbrowser.wml
Log:
update the website for the big TBB 3.x release!

Modified: website/trunk/download/en/download-easy.wml
===================================================================
--- website/trunk/download/en/download-easy.wml	2013-12-18 21:10:36 UTC (rev 26486)
+++ website/trunk/download/en/download-easy.wml	2013-12-19 00:10:44 UTC (rev 26487)
@@ -13,7 +13,7 @@
 <define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
 <define-tag button-win-tbb64>Currently Unused</define-tag>
 <define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
-<define-tag button-osx-tbb64>Mac 64-bit</define-tag>
+#<!-- Commented out until further notice. -EC <define-tag button-osx-tbb64>Mac 64-bit</define-tag> -->
 <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag>
 <define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag>
 
@@ -36,13 +36,13 @@
       <div id="windows" class="easy windows">
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
+	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
 	    <select name="language" id="win-tbb" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig" style="margin-bottom: 5px;">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
-	      (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
 	  </form>
 	  <div class="desc">
@@ -57,13 +57,13 @@
       <div id="mac" class="easy mac">
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
 	    <select name="language" id="osx-tbb" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig" style="margin-bottom: 5px;">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
 	  </form>
 	  <div class="desc">
@@ -74,17 +74,18 @@
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
 	</div>
       </div>
-<!-- START MAC 64-->
+<!-- START MAC 64 -->
+<!-- Comment out MAC 64 until it exists. -EC
       <div class="easy mac">
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
+	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
 	    <select name="language" id="osx-tbb64" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig" style="margin-bottom: 5px;">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
-	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
 	  </form>
 	  <div class="desc">
@@ -92,6 +93,7 @@
 	    <em>Version <version-torbrowserbundleosx64> - OS X (64-Bit) (10.6+)</em>
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p>
 	  </div>
+-->
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
 	</div>
       </div>
@@ -99,13 +101,13 @@
       <div id="linux" class="easy linux">
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
+	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
 	    <select name="language" id="lin-tbb32" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig" style="margin-bottom: 5px;">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
-	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
 	  </form>
 	  <div class="desc">
@@ -120,13 +122,13 @@
       <div class="easy linux">
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button lin-tbb64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
+	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
 	    <select name="language" id="lin-tbb64" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig" style="margin-bottom: 5px;">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
-	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
 	  </form>
 	  <div class="desc">

Modified: website/trunk/download/en/download.wml
===================================================================
--- website/trunk/download/en/download.wml	2013-12-18 21:10:36 UTC (rev 26486)
+++ website/trunk/download/en/download.wml	2013-12-19 00:10:44 UTC (rev 26487)
@@ -13,7 +13,7 @@
 <define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
 <define-tag button-win-tbb64>Currently Unused</define-tag>
 <define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
-<define-tag button-osx-tbb64>64-bit</define-tag>
+#<!-- Comment out until it's available again. -EC <define-tag button-osx-tbb64>64-bit</define-tag> -->
 <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag>
 <define-tag button-lin-tbb64>64-bit</define-tag>
 
@@ -41,16 +41,16 @@
 #<!-- NOTE - change language enabled button text at the top of this page -->
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
+	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
 	    <select name="language" id="win-tbb" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
-	      (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
 	    <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a><br />
-<!--	    <a class="additional" href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
 	  </form>
 
 	  <h2>Tor Browser Bundle</h2>
@@ -124,24 +124,27 @@
 #<!-- NOTE - change language enabled button text at the top of this page -->
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
 	    <select name="language" id="osx-tbb" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
-	    <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
+<!-- Comment out until 64-bit OSX bundles are available again
+	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
 	    <select name="language" id="osx-tbb64" class="lang">
+-->
 #include <lang.wmi>
+<!-- OSX 64. -EC
 	    </select>
 	    <div class="sig">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
-	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-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><br />
-<!--	    <a class="additional" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)-->
+	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)-->
 	  </form>
 
 	  <h2>Tor Browser Bundle</h2>
@@ -159,26 +162,26 @@
 #<!-- NOTE - change language enabled button text at the top of this page -->
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
 	  <form class="downloads">
-	    <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
+	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
 	    <select name="language" id="lin-tbb32" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
-	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
-<!--	    <a class="additional" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
 
-	    <a class="button lin-tbb64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
+	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
 	    <select name="language" id="lin-tbb64" class="lang">
 #include <lang.wmi>
 	    </select>
 	    <div class="sig">
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
-	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
 	    <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a><br />
-<!--	    <a class="additional" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
 	  </form>
 
 	  <h2>Tor Browser Bundle</h2>

Modified: website/trunk/include/versions.wmi
===================================================================
--- website/trunk/include/versions.wmi	2013-12-18 21:10:36 UTC (rev 26486)
+++ website/trunk/include/versions.wmi	2013-12-19 00:10:44 UTC (rev 26487)
@@ -23,10 +23,12 @@
 <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag>
 <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag>
 
-<define-tag version-torbrowserbundle whitespace=delete>2.3.25-15</define-tag>
+<define-tag version-torbrowserbundledir whitespace=delete>3.5</define-tag>
+
+<define-tag version-torbrowserbundle whitespace=delete>3.5</define-tag>
 <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag>
-<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag>
-<define-tag version-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag>
+<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag>
+<define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
 <define-tag version-torbrowser-torbutton whitespace=delete>1.5.2</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>
@@ -35,11 +37,11 @@
 <define-tag version-torbrowserbundlealpha whitespace=delete>2.4.18-rc-1</define-tag>
 <define-tag version-torobfsbundlealpha whitespace=delete>2.4.18-rc-1-pt1</define-tag>
 
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-15</define-tag>
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-16</define-tag>
-<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag>
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.5</define-tag>
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.5</define-tag>
+<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
 <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag>
-<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag>
+<define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
 <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
 <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag>
 <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.18-rc-1</define-tag>
@@ -47,10 +49,10 @@
 <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.18-rc-1-pt1</define-tag>
 <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.18-rc-2-pt1</define-tag>
 
-<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-15</define-tag>
+<define-tag version-torbrowserbundleosx32 whitespace=delete>3.5</define-tag>
 <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag>
-<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.3.25</define-tag>
-<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.11esr</define-tag>
+<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
+<define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
 <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
 <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag>
 <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.18-rc-1</define-tag>

Modified: website/trunk/projects/en/torbrowser.wml
===================================================================
--- website/trunk/projects/en/torbrowser.wml	2013-12-18 21:10:36 UTC (rev 26486)
+++ website/trunk/projects/en/torbrowser.wml	2013-12-19 00:10:44 UTC (rev 26487)
@@ -96,189 +96,190 @@
 	      <tbody>
 		<tr>
 		  <td>English (en-US)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-en-US.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-en-US.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_en-US.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_en-US.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_en-US.zip.asc">sig</a>)</em> 
+		  <!-- EC• <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-en-US.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr class="alt">
 		  <td>&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ar.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ar.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ar.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ar.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ar.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ar.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ar.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ar.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ar.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ar.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ar.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ar.zip.asc">sig</a>)</em> 
+		  <!-- EC• <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ar.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ar.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ar.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ar.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ar.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr>
 		  <td>Deutsch (de)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_de.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_de.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-de.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-de.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-de.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-de.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-de.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-de.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_de.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_de.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_de.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_de.zip.asc">sig</a>)</em> 
+		  <!-- EC • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-de.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_de.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_de.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_de.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_de.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr class="alt">
 		  <td>&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-ES.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-es-ES.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-es-ES.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-es-ES.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-es-ES.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-es-ES.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-es-ES.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_es-ES.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_es-ES.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_es-ES.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_es-ES.zip.asc">sig</a>)</em> 
+		  <!-- EC• <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-es-ES.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_es-ES.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_es-ES.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_es-ES.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_es-ES.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr>
 		  <td>&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fa.exe">32-bit</a>
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fa.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fa.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fa.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fa.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fa.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fa.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fa.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fa.exe">32-bit</a>
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fa.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fa.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fa.zip.asc">sig</a>)</em> 
+		  <!-- EC• <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fa.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fa.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fa.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fa.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fa.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr class="alt">
 		  <td>&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe">32-bit</a>
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fr.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-fr.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fr.exe">32-bit</a>
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_fr.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fr.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_fr.zip.asc">sig</a>)</em> 
+		  <!-- EC • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-fr.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fr.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_fr.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fr.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_fr.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr>
 		  <td>Italiano (it)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_it.exe">32-bit</a>
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_it.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-it.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-it.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-it.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-it.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-it.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-it.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_it.exe">32-bit</a>
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_it.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_it.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_it.zip.asc">sig</a>)</em> 
+		  <!-- EC • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_it.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_it.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_it.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_it.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr class="alt">
 		  <td>Korean (ko)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ko.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ko.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ko.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ko.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ko.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ko.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ko.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ko.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ko.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ko.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ko.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ko.zip.asc">sig</a>)</em> 
+		  <!-- • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ko.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ko.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ko.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ko.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr>
 		  <td>Nederlands (nl)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_nl.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_nl.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-nl.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-nl.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-nl.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-nl.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_nl.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_nl.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_nl.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_nl.zip.asc">sig</a>)</em> 
+		  <!-- EC • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_nl.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_nl.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_nl.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_nl.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr class="alt">
 		  <td>Polish (pl)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pl.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pl.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pl.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pl.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pl.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pl.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pl.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pl.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pl.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pl.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pl.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pl.zip.asc">sig</a>)</em> 
+		  <!-- • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pl.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pl.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pl.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pl.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pl.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr>
 		  <td>&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; (pt-PT)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-PT.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pt-PT.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-pt-PT.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pt-PT.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-pt-PT.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pt-PT.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-pt-PT.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pt-PT.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_pt-PT.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pt-PT.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_pt-PT.zip.asc">sig</a>)</em> 
+		  <!-- EC • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-pt-PT.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-PT.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-PT.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-PT.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-PT.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr class="alt">
 		  <td>&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ru.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ru.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ru.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ru.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ru.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ru.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ru.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ru.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ru.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_ru.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ru.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_ru.zip.asc">sig</a>)</em> 
+		  <!-- • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ru.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_ru.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ru.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_ru.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr>
 		  <td>Vietnamese (vi)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_vi.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_vi.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-vi.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-vi.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-vi.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-vi.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-vi.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-vi.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_vi.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_vi.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_vi.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_vi.zip.asc">sig</a>)</em> 
+		  <!-- • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_vi.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_vi.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_vi.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_vi.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 		<tr class="alt">
 		  <td>&#x7b80;&#x4f53;&#x5b57; (zh-CN)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-CN.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-zh-CN.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-zh-CN.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_zh-CN.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_zh-CN.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_zh-CN.zip.asc">sig</a>)</em> 
+		  <!-- EC • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-zh-CN.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_zh-CN.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_zh-CN.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_zh-CN.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_zh-CN.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 	      </tbody>
 	    </table>
 	  </div>
+<!-- Disable development releases until they exist again. -EC
 	  <div class="dltable" style="margin-top:-10px">
 	    <table>
 	      <thead>
@@ -292,20 +293,21 @@
 	      <tbody>
 		<tr class="alt">
 		  <td>English (en-US)</td>
-		  <td><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip.asc">sig</a>)</em></td>
-		  <td><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">32-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)</em> 
-		  • <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">64-bit</a> 
-		  <em>(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)</em></td>
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)</em> 
+		  <!-- EC • <a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64alpha>-osx-x86_64-en-US.zip.asc">sig</a>)</em></td> -->
+		  <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">32-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)</em> 
+		  • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">64-bit</a> 
+		  <em>(<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)</em></td>
 		</tr>
 	      </tbody>
 	    </table>
 	  </div>
+-->
 
 	  <p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>,
 	  which allows you to make sure you've downloaded the file we intended
@@ -322,8 +324,7 @@
 	  <p>Download the file above, save it somewhere, then click on it.
 	  Mac OS X will automatically unarchive it and you will have a TorBrowser application
 	  in your chosen language. <em>(e.g. TorBrowser_en-US.app)</em></p>
-	  <p>Click the TorBrowser application to launch Vidalia.</p>
-	  <p>Once Vidalia connects to the Tor Network, it will launch TorBrowser.</p>
+	  <p>Click the TorBrowserBundle application to launch TorBrowser.</p>
 	</div>
 	<div class="pjimage"><img src="$(IMGROOT)/screenshot-osx-torbrowser-icon.png" alt="Screenshot Mac OS X bundle" width="414" height="315"></div>
       </div>
@@ -333,16 +334,16 @@
 	<div class="pjtext">
 	  <p>Download the architecture-appropriate file above, save it somewhere, then
 	  run one of the following two commands to extract the package archive:</p>
-	  <p><code>tar -xvzf tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<var>LANG</var>.tar.gz</code></p>
+	  <p><code>tar -xvJf tor-browser-linux32-<version-torbrowserbundlelinux32>_<var>LANG</var>.tar.gz</code></p>
 	  <p>or (for the 64-bit version):</p>
-	  <p><code>tar -xvzf tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<var>LANG</var>.tar.gz</code></p>
+	  <p><code>tar -xvJf tor-browser-linux64-<version-torbrowserbundlelinux64>_<var>LANG</var>.tar.gz</code></p>
 	  <p><em>(where <var>LANG</var> is the language listed in the filename).</em></p>
 	  <p>Once that's done, switch to the Tor browser directory by running:</p>
 	  <p><code>cd tor-browser_<var>LANG</var></code></p>
 	  <p><em>(where <var>LANG</var> is the language listed in the filename).</em><p>
 	  <p>To run the Tor Browser Bundle, execute the <strong>start-tor-browser</strong> script:</p>
 	  <p><code>./start-tor-browser</code></p>
-	  <p>This will launch Vidalia and once that connects to Tor, it will launch
+	  <p>This will launch Tor Launcher and once that connects to Tor, it will launch
 	  Firefox. <strong><em>Do not unpack or run TBB as root.</em></strong></p>
 	</div>
       </div>
@@ -365,7 +366,7 @@
 	  <p>Once extraction is complete, open the folder <strong>Tor Browser</strong> from the location you saved the bundle.</p>
 	  <p>Double click on the <strong>Start Tor Browser</strong> (4) application (it may be called
 	  <strong>Start Tor Browser.exe</strong> on some systems.)</p>
-	  <p>The Vidalia window will shortly appear.</p>
+	  <p>The TorBrowser window will shortly appear.</p>
 	  <p><a href="$(IMGROOT)/tbb-screenshot2.png"><img src="$(IMGROOT)/tbb-screenshot2.png" alt="Screenshot of
 	  bundle startup" width="860" height="538"></a></p>
 	  <p>Once Tor is ready, Tor Browser will automatically be opened. Only web pages
@@ -402,7 +403,7 @@
 	  <p><strong><em>What is Tor and why do I need it?</em></strong> 
 	  <br>To learn more about Tor, visit the <a href="<page index>">Tor Project website</a>.</p>
 	  <p><strong><em>What is in the Tor Browser Bundle?</em></strong>
-	  <br>It contains Tor, Vidalia, a modified Firefox ESR, and Torbutton 
+	  <br>It contains Tor, a modified Firefox ESR, and Torbutton 
 	  (<a href="https://www.torproject.org/torbrowser/design/">design</a>) (<a
 	  href="<page projects/torbrowser-details>#contents">version details</a>).</p>
 	  <p><strong><em>How can I make my own bundle?</em></strong> 



More information about the tor-commits mailing list