@@ -12,7 +12,7 @@

 #<!-- Download button text for language enabled packages -->

 <define-tag button-win-tbb32>Tor Browser</define-tag>

 <define-tag button-win-tbb64>Currently Unused</define-tag>

-<define-tag button-osx-tbb32>Tor Browser</define-tag>

+<define-tag button-osx-tbb64>Tor Browser</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 (32-Bit)</define-tag>

 <define-tag button-lin-tbb64>Tor Browser (64-Bit)</define-tag>

@@ -81,7 +81,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #<!-- 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/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>

+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>

 	    <select name="language" id="osx-tbb" class="lang">

 #include <lang.wmi>

 	    </select>

@@ -90,20 +90,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

-# Comment out until 64-bit Mac OS X bundles are available again

-#	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundleosx64>/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">

-

-# NO #include <lang.wmi>

-#	    </select>

-#	    <div class="sig">

-#	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>

-#<!-- Mac OS X 64. -EC

-#	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/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/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)

-

 	  </form>

 	  <h2>Tor Browser</h2>

@@ -41,16 +41,16 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #<!-- 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/<version-torbrowserbundledir>/torbrowser-install-<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-torbrowserbundle>/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>#downloads">Other Languages</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>

+	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundle>/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>#downloads-alpha">Download Unstable</a><br />

-<!--	    <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>)-->

+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlealpha>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlealpha>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->

 	  </form>

 	  <h2>Tor Browser</h2>

@@ -81,17 +81,17 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #<!-- 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/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>

+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><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>#downloads">Other Languages</a>

-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

 # Comment out until 64-bit Mac OS X 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>

+#	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundleosx64>/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">

 # NO #include <lang.wmi>

@@ -99,10 +99,10 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #	    <div class="sig">

 #	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>

 #<!-- Mac OS X 64. -EC

-#	      (<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>

+#	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/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/<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>)

+#	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)

 	  </form>

@@ -121,26 +121,26 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #<!-- 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-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>

+	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/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>#downloads">Other Languages</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>

+	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/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>#downloads-alpha">Download Unstable</a><br />

-<!--	    <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>)-->

+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlelinux64alpha>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64alpha>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</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>

+	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/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>#downloads">Other Languages</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>

+	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/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/<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="additional" href="../dist/torbrowser/<version-torbrowserbundlelinux32alpha>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux32alpha>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->

 	  </form>

@@ -356,71 +356,7 @@ Code</a></li>

 </div>

 </div>

 <!-- START DONATION WIDGET -->

-  <script async type="text/javascript">

-  function displayVals() {

-    var t3 = $("#t3").val();

-    var amount = $("#amount").val();

-    if(t3 != 0){

-      $('#a3').val(amount);

-      $('#p3').val(1);

-      $('#cmd').val('_xclick-subscriptions');

-      $('#item_name').val('Tor Project Membership');

-      $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');

-    }else{

-      $('#a3').val(0);

-      $('#p3').val(0);

-      $('#cmd').val('_donations');

-      $('#item_name').val('Donation to the Tor Project');

-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');

-    }

-    if( !t3 ) {

-      $('#cmd').val('_donations');

-      $('#item_name').val('Donation to the Tor Project');

-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');

-    }

-  }

-  $(function(){

-    $("#amount").change(displayVals);

-    $("#t3").change(displayVals);

-    displayVals();

-  });

-  </script>

-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post" style="float:left; margin-bottom:10px;">

-    <h2>Donate to Tor</h2>

-      <p>

-	<select name="currency_code" class="cur">

-	  <option value="USD" selected="selected">$</option>

-	  <option value="EUR">&euro;</option>

-	  <option value="GBP">&pound;</option>

-	  <option value="YEN">&yen;</option>

-	</select>

-	<input type="text" id="amount" class="amount" name="amount" value="5" size="10">

-      </p>

-      <p>

-	<input type="hidden" id="a3" name="a3" value="0">

-	  <select id="t3" name="t3">

-	    <option value="0">One-time Donation</option>

-	    <option value="M">Monthly Subscription</option>

-	  </select>

-      </p>

-      <p>

-	<input type="hidden" id="p3" name="p3" value="1">

-	<input type="hidden" name="sra" value="1">

-	<input type="hidden" name="src" value="1">

-	<input type="hidden" name="no_shipping" value="1">

-	<input type="hidden" name="no_note" value="1">

-	<input type="hidden" id="cmd" name="cmd" value="_donations">

-	<input type="hidden" name="business" value="donations@torproject.org">

-	<input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">

-	<input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html">

-	<input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html">

-      </p>

-      <h6 id="ppinfo" style="height:0px;"></h6>

-      <p>

-	<input class="donate-btn" type="submit" name="donate" value="Donate">

-      </p>

-      <p><a href="<page donate/donate>">Other donation options...</a></p>

-</form>

+<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>

 <!-- END DONATION WIDGET -->

 <!-- START INFO -->

 <div class="img-shadow">

@@ -215,7 +215,7 @@ custom configurations. All an apt-get or yum install away.</p>

 you are used to.</p>

 <ol>

-<li><b>Use the Tor Browser</b>

+<li><b>Use Tor Browser</b>

 <p>

@@ -224,7 +224,7 @@ run it. Tor only protects your applications that are properly configured to

 send their Internet traffic through Tor. To avoid problems with Tor

 configuration, we strongly recommend you use the

 <a href="<page projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect

-your privacy and anonymity on the web as long as you're browsing with the Tor

+your privacy and anonymity on the web as long as you're browsing with Tor

 Browser itself. Almost any other web browser configuration is likely to be

 unsafe to use with Tor.

@@ -249,10 +249,10 @@ traffic</a> this way, you also slow down the entire Tor network for everyone els

 <p>

-The Tor Browser will block browser plugins such as Flash, RealPlayer,

+Tor Browser will block browser plugins such as Flash, RealPlayer,

 Quicktime, and others: they can be manipulated into revealing your IP address.

 Similarly, we do not recommend installing additional addons or plugins into

-the Tor Browser, as these may bypass Tor or otherwise harm your anonymity and

+Tor Browser, as these may bypass Tor or otherwise harm your anonymity and

 privacy.

 </p>

@@ -267,7 +267,7 @@ Tor will encrypt your traffic

 <a href="<page about/overview>#thesolution">to and

 within the Tor network</a>, but the encryption of your traffic to the final

 destination website depends upon on that website. To help ensure private

-encryption to websites, the Tor Browser includes <a

+encryption to websites, Tor Browser includes <a

 href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the

 use of HTTPS encryption with major websites that support it. However, you

 should still watch the browser URL bar to ensure that websites you provide

@@ -286,7 +286,7 @@ and HTTPS relate</a>.

 <p>

-The Tor Browser will warn you before automatically opening documents that are

+Tor Browser will warn you before automatically opening documents that are

 handled by external applications. <b>DO NOT IGNORE THIS WARNING</b>.  You

 should be very careful when downloading documents via Tor (especially DOC and

 PDF files, unless you use the PDF viewer that's built into Tor Browser) as

@@ -14,8 +14,8 @@

 <define-tag button-win-tbb64>Currently Unused</define-tag>

 <define-tag button-osx-tbb32>Tor Browser</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</define-tag>

-<define-tag button-lin-tbb64>64-bit</define-tag>

+<define-tag button-lin-tbb32>Tor Browser (32-Bit)</define-tag>

+<define-tag button-lin-tbb64>Tor Browser (64-Bit)</define-tag>

 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"

@@ -121,26 +121,27 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #<!-- 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/<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">

+	    <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>#downloads">Other Languages</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>

+	      (<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="../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="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

+<!--	    <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>)-->

-	    <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">

+	    <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>#downloads">Other Languages</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>

+	      (<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="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

-<!--	    <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>)-->

+<!--	    <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>-->

+

 	  </form>

 	  <h2>Tor Browser</h2>

@@ -114,7 +114,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

  <!-- END OS X -->

  <!-- START UNIX -->

       <div id="linux" class="accordionButton on">

-	<span class="linux24">GNU/Linux, BSD, and Unix</span></div>

+	<span class="linux24">Linux</span></div>

       <div class="accordionContent">

 	<div class="fauxhead"></div>

   <!-- TOR BROWSER BUNDLE -->

@@ -288,10 +288,11 @@ and HTTPS relate</a>.

 The Tor Browser will warn you before automatically opening documents that are

 handled by external applications. <b>DO NOT IGNORE THIS WARNING</b>.  You

 should be very careful when downloading documents via Tor (especially DOC and

-PDF files) as these documents can contain Internet resources that will be

-downloaded outside of Tor by the application that opens them. This will reveal

-your non-Tor IP address. If you must work with DOC and/or PDF files, we

-strongly recommend either using a disconnected computer,

+PDF files, unless you use the PDF viewer that's built into Tor Browser) as

+these documents can contain Internet resources that will be downloaded outside

+of Tor by the application that opens them. This will reveal your non-Tor IP

+address. If you must work with DOC and/or PDF files, we strongly recommend

+either using a disconnected computer,

 downloading the free <a href="https://www.virtualbox.org/">VirtualBox</a> and

 using it with a <a href="http://virtualboxes.org/">virtual machine image</a>

 with networking disabled, or using <a href="https://tails.boum.org/">Tails</a>.

@@ -54,7 +54,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  </form>

 	  <h2>Tor Browser</h2>

-	  <em>Version <version-torbrowserbundle> - Windows 10, 8, 7, Vista, and XP</em>

+	  <em>Version <version-torbrowserbundle> (<releasedate-torbrowserbundle>) - Windows 10, 8, 7, Vista, and XP</em>

 	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	</div>

 <!-- EXPERT BUNDLE -->

@@ -107,7 +107,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  </form>

 	  <h2>Tor Browser</h2>

-	  <em>Version <version-torbrowserbundleosx64> - OS X Intel</em>

+	  <em>Version <version-torbrowserbundleosx64> (<releasedate-torbrowserbundleosx64>)- OS X Intel</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 &raquo;</a></p>

 	</div>

   </div>

@@ -144,7 +144,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  </form>

 	  <h2>Tor Browser</h2>

-	  <em>Version <version-torbrowserbundlelinux32> - Linux, BSD, and Unix</em>

+	  <em>Version <version-torbrowserbundlelinux32> (<releasedate-torbrowserbundlelinux32>) - Linux, BSD, and Unix</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 &raquo;</a></p>

@@ -176,14 +176,6 @@ custom configurations. All an apt-get or yum install away.</p>

 	  <h2>Android Bundle</h2>

 	  <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p>

 	</div>

-<!-- Nokia -->

-	<div class="package" style="border-bottom: 0px;">

-	  <div class="downloads">

-	    <a class="additional" style="font-weight: bold;" href="<page docs/N900>">Experimental Instructions</a>

-	  </div>

-

-	  <h2>Nokia Maemo/N900</h2>

-	</div>

       </div>

 <!-- END SMARTPHONES -->

 <!-- BEGIN SOURCE -->

@@ -54,7 +54,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  </form>

 	  <h2>Tor Browser</h2>

-	  <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>

+	  <em>Version <version-torbrowserbundle> - Windows 10, 8, 7, Vista, and XP</em>

 	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	</div>

 <!-- EXPERT BUNDLE -->

@@ -67,7 +67,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  </div>

 	  <h2>Expert Bundle</h2>

-	  <em>Windows 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>

+	  <em>Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>

 	  <p>Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually. This installer must be run as Administrator.</p>

 	</div>

       </div>

@@ -81,13 +81,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #<!-- 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/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg"><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-torbrowserbundleosx64>-osx64_<lang>.dmg"><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>#downloads">Other Languages</a>

-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.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-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

 # Comment out until 64-bit Mac OS X bundles are available again

@@ -107,7 +107,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  </form>

 	  <h2>Tor Browser</h2>

-	  <em>Version <version-torbrowserbundleosx32> - OS X Intel</em>

+	  <em>Version <version-torbrowserbundleosx64> - OS X Intel</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 &raquo;</a></p>

 	</div>

   </div>

@@ -90,7 +90,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

-# Comment out until 64-bit OSX bundles are available again

+# Comment out until 64-bit Mac OS X 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">

@@ -98,7 +98,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #	    </select>

 #	    <div class="sig">

 #	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>

-#<!-- OSX 64. -EC

+#<!-- Mac OS X 64. -EC

 #	      (<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 />

@@ -57,45 +57,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>

 	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	</div>

-<!-- VIDALIA BRIDGE BUNDLE -->

-	<div class="package">

-	  <div class="downloads">

-	    <a class="button" href="<package-win32-bridge-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Bridge Bundle </span></a>

-	    <div class="sig">

-	      (<a href="<package-win32-bridge-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

-	    </div>

-	  </div>

-

-	  <h2>Vidalia Bridge Bundle</h2>

-	  <em>Windows 8, 7, Vista, and XP</em>

-	  <p>A Vidalia Bundle which is configured to be a <a href="<page docs/bridges>">bridge</a> by default. This helps censored users reach the Tor network.</p>

-	</div>

-<!-- VIDALIA RELAY BUNDLE -->

-	<div class="package">

-	  <div class="downloads">

-	    <a class="button" href="<package-win32-relay-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Relay Bundle </span></a>

-	    <div class="sig">

-	      (<a href="<package-win32-relay-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

-	    </div>

-	  </div>

-

-	  <h2>Vidalia Relay Bundle</h2>

-	  <em>Windows 8, 7, Vista, and XP</em>

-	  <p>A Vidalia Bundle which is configured to be a non-exit <a href="<page docs/tor-doc-relay>">relay</a> by default. This helps grow the Tor network.</p>

-	</div>

-<!-- VIDALIA EXIT BUNDLE -->

-	<div class="package">

-	  <div class="downloads">

-	    <a class="button" href="<package-win32-exit-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Exit Bundle</span></a>

-	    <div class="sig">

-	      (<a href="<package-win32-exit-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

-	    </div>

-	  </div>

-

-	  <h2>Vidalia Exit Bundle</h2>

-	  <em>Windows 8, 7, Vista, and XP</em>

-	  <p>A Vidalia Bundle which is configured to be an <a href="<page docs/tor-doc-relay>">exit relay</a> by default. <strong>Please read these <a href="https://blog.torproject.org/running-exit-node">tips for running an exit node with minimal harassment</a> before you get started!</strong></p>

-	</div>

 <!-- EXPERT BUNDLE -->

 	<div class="package">

 	  <div class="downloads">

@@ -299,10 +299,7 @@ The Tor Browser will block browser plugins such as Flash, RealPlayer,

 Quicktime, and others: they can be manipulated into revealing your IP address.

 Similarly, we do not recommend installing additional addons or plugins into

 the Tor Browser, as these may bypass Tor or otherwise harm your anonymity and

-privacy. The lack of plugins means that Youtube videos are blocked by default,

-but Youtube does provide an experimental opt-in feature

-<a href="https://www.youtube.com/html5">(enable it here)</a> that works for some

-videos.

+privacy.

 </p>

@@ -244,7 +244,7 @@ custom configurations. All an apt-get or yum install away.</p>

 	  <h2>Source Tarball</h2>

 	  <p> Configure with: <code style="color: #666666;">./configure &amp;&amp; make &amp;&amp; src/or/tor</code></p>

-	  <p>The current stable version of Tor is <version-stable>. Its <a href="<gitblobstable>ReleaseNotes">release notes</a> are available.</p>

+	  <p>The current stable version of Tor is <version-stable>. Its <a href="<gitblob>ReleaseNotes<cgitstable>">release notes</a> are available.</p>

 	  <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="<gitblob>ChangeLog">Changelog</a> is available.</p>

 	</div>

       </div>

@@ -213,7 +213,7 @@ custom configurations. All an apt-get or yum install away.</p>

 	  </div>

 	  <h2>Android Bundle</h2>

-	  <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://market.android.com/search?q=guardianproject&so=1&c=apps">Google Play Store</a>.</p>

+	  <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p>

 	</div>

 <!-- Nokia -->

 	<div class="package" style="border-bottom: 0px;">

@@ -46,7 +46,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #include <lang.wmi>

 	    </select>

 	    <div class="sig">

-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>

+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</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>#downloads-alpha">Download Unstable</a><br />

@@ -125,7 +125,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #include <lang.wmi>

 	    </select>

 	    <div class="sig">

-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>

+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>

 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

@@ -136,7 +136,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 # NO #include <lang.wmi>

 #	    </select>

 #	    <div class="sig">

-#	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>

+#	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>

 #<!-- OSX 64. -EC

 #	      (<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>

@@ -165,7 +165,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #include <lang.wmi>

 	    </select>

 	    <div class="sig">

-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>

+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</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/<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>-->

@@ -175,7 +175,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #include <lang.wmi>

 	    </select>

 	    <div class="sig">

-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>

+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</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>#downloads-alpha">Download Unstable</a><br />

@@ -49,7 +49,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</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>#downloads-beta">Download Unstable</a><br />

+	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

 <!--	    <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>

@@ -128,7 +128,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>

 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

-	    <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />

+	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

 # 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">

@@ -178,7 +178,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</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>#downloads-beta">Download Unstable</a><br />

+	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />

 <!--	    <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>

@@ -107,7 +107,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  <h2>Expert Bundle</h2>

 	  <em>Windows 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>

-	  <p>Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually.</p>

+	  <p>Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually. This installer must be run as Administrator.</p>

 	</div>

       </div>

 <!-- END WINDOWS -->

@@ -10,11 +10,11 @@

 <define-tag lang>en-US</define-tag>

 #<!-- Download button text for language enabled packages -->

-<define-tag button-win-tbb32>Tor Browser Bundle</define-tag>

+<define-tag button-win-tbb32>Tor Browser</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-tbb32>Tor Browser</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-tbb32>Tor Browser</define-tag>

 <define-tag button-lin-tbb64>64-bit</define-tag>

 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"

@@ -53,7 +53,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 <!--	    <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>

+	  <h2>Tor Browser</h2>

 	  <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>

 	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	</div>

@@ -145,7 +145,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  </form>

-	  <h2>Tor Browser Bundle</h2>

+	  <h2>Tor Browser</h2>

 	  <em>Version <version-torbrowserbundleosx32> - OS X Intel</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 &raquo;</a></p>

 	</div>

@@ -182,7 +182,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 <!--	    <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>

+	  <h2>Tor Browser</h2>

 	  <em>Version <version-torbrowserbundlelinux32> - Linux, BSD, and Unix</em>

 	  <p>Everything you need to safely browse the Internet. This

 package requires no installation. Just extract it and run. <a

@@ -269,7 +269,7 @@ Tor does not protect all of your computer's Internet traffic when you

 run it. Tor only protects your applications that are properly configured to

 send their Internet traffic through Tor. To avoid problems with Tor

 configuration, we strongly recommend you use the

-<a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It is pre-configured to protect

+<a href="<page projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect

 your privacy and anonymity on the web as long as you're browsing with the Tor

 Browser itself. Almost any other web browser configuration is likely to be

 unsafe to use with Tor.

@@ -316,7 +316,7 @@ Tor will encrypt your traffic

 <a href="<page about/overview>#thesolution">to and

 within the Tor network</a>, but the encryption of your traffic to the final

 destination website depends upon on that website. To help ensure private

-encryption to websites, the Tor Browser Bundle includes <a

+encryption to websites, the Tor Browser includes <a

 href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the

 use of HTTPS encryption with major websites that support it. However, you

 should still watch the browser URL bar to ensure that websites you provide

@@ -64,7 +64,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	    <div class="sig">

 	      (<a href="<package-win32-bridge-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

-            <a class="additional" href="<package-win32-bridge-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-bridge-bundle-alpha>.asc">sig</a>)

 	  </div>

 	  <h2>Vidalia Bridge Bundle</h2>

@@ -78,7 +77,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	    <div class="sig">

 	      (<a href="<package-win32-relay-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

-            <a class="additional" href="<package-win32-relay-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-relay-bundle-alpha>.asc">sig</a>)

 	  </div>

 	  <h2>Vidalia Relay Bundle</h2>

@@ -92,7 +90,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	    <div class="sig">

 	      (<a href="<package-win32-exit-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

-            <a class="additional" href="<package-win32-exit-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-exit-bundle-alpha>.asc">sig</a>)

 	  </div>

 	  <h2>Vidalia Exit Bundle</h2>

@@ -106,7 +103,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	    <div class="sig">

 	      (<a href="<package-win32-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

-	    <a class="additional" href="<package-win32-alpha>">Download Unstable</a> (<a href="<package-win32-alpha>.asc">sig</a>)

 	  </div>

 	  <h2>Expert Bundle</h2>

@@ -124,13 +124,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #<!-- 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/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<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>-osx32_<lang>.dmg"><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/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<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>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>

 	    </div>

 	    <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />

 # Comment out until 64-bit OSX bundles are available again

@@ -317,7 +317,7 @@ videos.

 <p>

 Tor will encrypt your traffic

-<a href="<page overview>#thesolution">to and

+<a href="<page about/overview>#thesolution">to and

 within the Tor network</a>, but the encryption of your traffic to the final

 destination website depends upon on that website. To help ensure private

 encryption to websites, the Tor Browser Bundle includes <a

@@ -317,7 +317,7 @@ videos.

 <p>

 Tor will encrypt your traffic

-<a href="https://www.torproject.org/about/overview.html.en#thesolution">to and

+<a href="<page overview>#thesolution">to and

 within the Tor network</a>, but the encryption of your traffic to the final

 destination website depends upon on that website. To help ensure private

 encryption to websites, the Tor Browser Bundle includes <a

@@ -49,7 +49,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</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="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />

 <!--	    <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>

@@ -132,6 +132,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</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="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />

 # 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">

@@ -181,7 +182,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</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="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />

 <!--	    <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>

@@ -55,7 +55,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	  <h2>Tor Browser Bundle</h2>

 	  <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</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 &raquo;</a></p>

+	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	</div>

 <!-- VIDALIA BRIDGE BUNDLE -->

 	<div class="package">

@@ -132,19 +132,20 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</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>

-<!-- 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/<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/<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>)-->

+# 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">

+

+# NO #include <lang.wmi>

+#	    </select>

+#	    <div class="sig">

+#	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>

+#<!-- OSX 64. -EC

+#	      (<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/<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>

@@ -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 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #<!-- 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 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo

 #<!-- 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>