@@ -131,6 +131,11 @@

         <pre>pkg_add tor-browser</pre>

+	<p>Sometimes the most recent version of Tor Browser on OpenBSD is behind the current release. The available version of TB on OpenBSD should be checked with:

+

+	<pre>pkg_info -Q tor-browser</pre>

+

+	<p>If provided version is not the current Tor Browser version, it is not recommended.</p>

         <p>To install the Tor Browser port from an updated ports tree, run:</p>

@@ -119,6 +119,25 @@

 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

 	</div>

       </div>

+<!-- START BSD -->

+

+  <div id="openbsd" class="easy bsd">

+    <div class="package" style="padding-top: 13px; border-top: 0px;">

+      <div class="desc">

+        <h2>Running Tor on OpenBSD</h2>

+	<p>These are installation instructions for running Tor Browser in a OpenBSD environment.</p>

+	<p>To install from OpenBSD's packages, run:</p>

+

+

+        <pre>pkg_add tor-browser</pre>

+

+   

+        <p>To install the Tor Browser port from an updated ports tree, run:</p>

+

+        <pre>cd /usr/ports/meta/tor-browser && make install</pre>

+      </div>

+    </div>

+  </div>

 <!-- START Orbot -->

       <div id="android" class="easy android">

     <div class="package" style="padding-top: 13px; border-top: 0px;">

@@ -268,6 +287,7 @@ are blocked.</p>

 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>

 <li class="dropdown"><a href="#mac">Apple OS X</a></li>

 <li class="dropdown"><a href="#linux">Linux</a></li>

+<li class="dropdown"><a href="#openbsd">OpenBSD</a></li>

 <li class="dropdown"><a href="#android">Android</a></li>

 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>

 </ul>

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

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

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

@@ -64,7 +64,7 @@

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

 	  </div>

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

@@ -43,13 +43,13 @@

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

 	  </div>

 	  <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" style="margin-bottom: 5px;">

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

 	  </form>

 	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">Linux</a></p>

@@ -64,13 +64,13 @@

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

 	  </div>

 	  <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" style="margin-bottom: 5px;">

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

 	  </form>

 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p>

@@ -85,13 +85,13 @@

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

 	  <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" style="margin-bottom: 5px;">

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

 	  </form>

 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

@@ -107,13 +107,13 @@

 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

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

+	    <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" style="margin-bottom: 5px;">

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

 	  </form>

 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

@@ -60,7 +60,7 @@

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for Mac</h2>

-	    <em>Version <version-torbrowserbundleosx64> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

+	    <em>Version <version-torbrowserbundleosx64> - OS X (10.9+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

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

 	  </div>

 	  <form class="downloads">

@@ -77,7 +77,7 @@

         </div>

       </div>

 <!-- START LINUX 64-Bit -->

-      <div class="easy linux">

+      <div id="linux" class="easy linux">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for Linux (64-Bit)</h2>

@@ -98,7 +98,7 @@

 	</div>

       </div>

 <!-- START LINUX -->

-      <div id="linux" class="easy linux">

+      <div class="easy linux">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for Linux (32-Bit)</h2>

@@ -173,14 +173,14 @@ is likely to be unsafe to use with Tor.</p>

 </li>

 <li><b>Don't torrent over Tor</b>

 <p>

-Torrent file-sharing applications have been observed to ignore proxy 

-settings and make direct connections even when they are told to use Tor. 

-Even if your torrent application connects only through Tor, you will 

-often send out your real IP address in the tracker GET request, 

-because that's how torrents work. Not only do you <a 

+Torrent file-sharing applications have been observed to ignore proxy

+settings and make direct connections even when they are told to use Tor.

+Even if your torrent application connects only through Tor, you will

+often send out your real IP address in the tracker GET request,

+because that's how torrents work. Not only do you <a

 href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">

-deanonymize your torrent traffic and your other simultaneous Tor web 

-traffic</a> this way, you also slow down the entire Tor network for everyone else. 

+deanonymize your torrent traffic and your other simultaneous Tor web

+traffic</a> this way, you also slow down the entire Tor network for everyone else.

 </p>

 </li>

 <li><b>Don't enable or install browser plugins</b>

@@ -144,61 +144,7 @@

 <div id="dow-don-right">

-

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

-    <h2><big style="font-weight: bold; font-size: 1.2em;">Help</big><small style="font-size: 0.9em;" > Create more </small><big style="font-weight: bold; font-size: 1.2em;">Tor</big><big style="font-size: 1.2em;">!</big></h2>

-      <p>

-	<input type="hidden" name="currency_code" class="cur" value="USD">

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

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

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

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

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

-      </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> <!-- END DONATION WIDGET -->

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

 </div> <!-- END dow-don-right -->

@@ -215,14 +215,14 @@ exactly as you are used to.</p>

 <ol>

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

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

 <p>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</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

+with Tor Browser itself. Almost any other web browser configuration

 is likely to be unsafe to use with Tor.</p>

 </li>

 <li><b>Don't torrent over Tor</b>

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

 </p>

 </li>

 <li><b>Don't enable or install browser plugins</b>

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

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

+plugins into Tor Browser, as these may bypass Tor or otherwise harm

 your anonymity and privacy.</p>

 </li>

@@ -250,7 +250,7 @@ your anonymity and privacy.</p>

 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

+ensure private 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

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

 </li>

 <li><b>Don't open documents downloaded through Tor while online</b>

-<p>The Tor Browser will warn you before automatically opening

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

@@ -76,44 +76,44 @@

 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p>

         </div>

       </div>

-<!-- START LINUX -->

-      <div id="linux" class="easy linux">

+<!-- START LINUX 64-Bit -->

+      <div class="easy linux">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

-	    <h2>Tor Browser for Linux</h2>

-	    <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />

-	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

+	    <h2>Tor Browser for Linux (64-Bit)</h2>

+	    <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

 	  <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" style="margin-bottom: 5px;">

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

 	  </form>

 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

 	</div>

       </div>

-<!-- START LINUX 64-Bit -->

-      <div class="easy linux">

+<!-- START LINUX -->

+      <div id="linux" class="easy linux">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

-	    <h2>Tor Browser for 64-Bit Linux</h2>

-	    <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

+	    <h2>Tor Browser for Linux (32-Bit)</h2>

+	    <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />

+	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

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

-	    <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" style="margin-bottom: 5px;">

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

 	  </form>

 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

@@ -75,24 +75,6 @@

 	  </form>

 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p>

         </div>

-        <!-- To update these screenshots: Press Command-Shift-4 and then Spacebar, then click on the window. See #14838. -->

-        <table class="howto">

-          <tr>

-            <th>1. Install</th>

-            <th>2. Control-click</th>

-            <th>3. Open</th>

-          </tr>

-          <tr>

-            <td><img src="$(IMGROOT)/tbb-macosx-step-1.png" alt="Screenshot showing the contents of the Tor Browser dmg file."></td>

-            <td><img src="$(IMGROOT)/tbb-macosx-step-2.png" alt="Screenshot of the Applications folder with the Tor Browser icon."></td>

-            <td><img src="$(IMGROOT)/tbb-macosx-step-3.png" alt="Dialog offering to open Tor Browser."></td>

-          </tr>

-          <tr>

-            <td>Drag the Tor Browser icon to the Applications folder and open the Applications folder.</td>

-            <td>Control-click on the Tor Browser icon (click the mouse button while pressing the Control key on the keyboard) and choose &ldquo;Open&rdquo;.</td>

-            <td>Click &ldquo;Open&rdquo; on the next screen.</td>

-          </tr>

-        </table>

       </div>

 <!-- START LINUX -->

       <div id="linux" class="easy linux">

@@ -14,7 +14,7 @@

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

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

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

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

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

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

@@ -52,7 +52,7 @@

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

-	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">GNU/Linux</a></p>

+	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">Linux</a></p>

 	</div>

       </div>

 <!-- START MAC -->

@@ -73,7 +73,7 @@

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

 	  </form>

-	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>

+	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p>

         </div>

         <!-- To update these screenshots: Press Command-Shift-4 and then Spacebar, then click on the window. See #14838. -->

         <table class="howto">

@@ -98,8 +98,8 @@

       <div id="linux" class="easy linux">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

-	    <h2>Tor Browser for GNU/Linux</h2>

-	    <em>Version <version-torbrowserbundlelinux32> - Linux, FreeBSD (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

+	    <h2>Tor Browser for Linux</h2>

+	    <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />

 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

@@ -113,14 +113,14 @@

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

-	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

+	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

 	</div>

       </div>

 <!-- START LINUX 64-Bit -->

       <div class="easy linux">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

-	    <h2>Tor Browser for 64-Bit GNU/Linux</h2>

+	    <h2>Tor Browser for 64-Bit Linux</h2>

 	    <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

@@ -134,7 +134,7 @@

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

-	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

+	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

 	</div>

       </div>

 <!-- START Orbot -->

@@ -339,7 +339,7 @@ are blocked.</p>

 <ul>

 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>

 <li class="dropdown"><a href="#mac">Apple OS X</a></li>

-<li class="dropdown"><a href="#linux">Linux/FreeBSD</a></li>

+<li class="dropdown"><a href="#linux">Linux</a></li>

 <li class="dropdown"><a href="#android">Android</a></li>

 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>

 </ul>

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

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

+documents via Tor (especially DOC and 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

@@ -99,7 +99,7 @@

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for GNU/Linux</h2>

-	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

+	    <em>Version <version-torbrowserbundlelinux32> - Linux, FreeBSD (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />

 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

@@ -121,7 +121,7 @@

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for 64-Bit GNU/Linux</h2>

-	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

+	    <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

 	  <form class="downloads">

@@ -338,7 +338,7 @@ are blocked.</p>

 <ul>

 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>

 <li class="dropdown"><a href="#mac">Apple OS X</a></li>

-<li class="dropdown"><a href="#linux">Linux/Unix</a></li>

+<li class="dropdown"><a href="#linux">Linux/FreeBSD</a></li>

 <li class="dropdown"><a href="#android">Android</a></li>

 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>

 </ul>

@@ -142,11 +142,15 @@

     <div class="package" style="padding-top: 13px; border-top: 0px;">

       <div class="desc">

         <h2>Orbot - Tor for Android</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>

-        <a href="https://www.torproject.org/docs/android.html.en">Learn more &raquo;</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/fdroid/">F-Droid Repository</a> or

+        the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google

+        Play Store</a>. <a href="<page docs/android>">Learn more &raquo;</a>

+        </p>

       </div>

       <form class="downloads">

-        <a class="button lin-orbot" href="https://guardianproject.info/apps/orbot/?src=tbb_download"><span class="strong">Download</span><span class="normal">Orbot</span></a>

+        <a class="button" href="https://guardianproject.info/apps/orbot/?src=tbb_download"><span class="strong">Download</span><span class="normal">Orbot</span></a>

       </form>

     </div>

       </div>

@@ -300,10 +300,15 @@ use Tor, too!</p>

 This list of pitfalls isn't complete, and we need your help <a href="<page

 getinvolved/volunteer>#Documentation">identifying and documenting all

 the issues</a>.</p><br />

-<h2><a class="anchor" href="#mirror">What else can I get Tor?</a></h2>

-<p>In some countries the Tor Project website is blocked or censored and it is not possible to download

- Tor directly. The Tor Project also hosts a mirror of <a href="https://github.com/TheTorProject/gettorbrowser">Tor Browser Bundle on Github</a>.</p><br />

-<p>The <a href="https://www.torproject.org/projects/gettor">GetTor</a> service can also be used to download Tor Browser when the Project website and mirrors are blocked.</p>

+<h2><a class="anchor" href="#mirror">Where else can I get Tor?</a></h2>

+<p>In some countries the Tor Project website is blocked or censored and

+it is not possible to download Tor directly. The Tor Project hosts a

+Tor Browser <a

+href="https://github.com/TheTorProject/gettorbrowser">mirror on Github</a>.</p><br />

+<p>Using the <a

+href="https://www.torproject.org/projects/gettor">GetTor</a> service is

+another way to download Tor Browser when the Project website and mirrors

+are blocked.</p>

 </div>

 <!-- END WARNING -->

@@ -299,7 +299,11 @@ use Tor, too!</p>

 <p>Be smart and learn more. Understand what Tor does and does not offer.

 This list of pitfalls isn't complete, and we need your help <a href="<page

 getinvolved/volunteer>#Documentation">identifying and documenting all

-the issues</a>.</p>

+the issues</a>.</p><br />

+<h2><a class="anchor" href="#mirror">What else can I get Tor?</a></h2>

+<p>In some countries the Tor Project website is blocked or censored and it is not possible to download

+ Tor directly. The Tor Project also hosts a mirror of <a href="https://github.com/TheTorProject/gettorbrowser">Tor Browser Bundle on Github</a>.</p><br />

+<p>The <a href="https://www.torproject.org/projects/gettor">GetTor</a> service can also be used to download Tor Browser when the Project website and mirrors are blocked.</p>

 </div>

 <!-- END WARNING -->

@@ -137,6 +137,19 @@

 	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

 	</div>

       </div>

+<!-- START Orbot -->

+      <div id="android" class="easy android">

+    <div class="package" style="padding-top: 13px; border-top: 0px;">

+      <div class="desc">

+        <h2>Orbot - Tor for Android</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>

+        <a href="https://www.torproject.org/docs/android.html.en">Learn more &raquo;</a></p>

+      </div>

+      <form class="downloads">

+        <a class="button lin-orbot" href="https://guardianproject.info/apps/orbot/?src=tbb_download"><span class="strong">Download</span><span class="normal">Orbot</span></a>

+      </form>

+    </div>

+      </div>

       <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>

 		<!-- END DOWNLOADS --><br>

 </div> <!-- END dow-don-left -->

@@ -313,6 +326,7 @@ the issues</a>.</p>

 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>

 <li class="dropdown"><a href="#mac">Apple OS X</a></li>

 <li class="dropdown"><a href="#linux">Linux/Unix</a></li>

+<li class="dropdown"><a href="#android">Android</a></li>

 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>

 </ul>

 </div>

@@ -39,7 +39,7 @@

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for Windows</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. <br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

 	  <form class="downloads">

@@ -60,17 +60,17 @@

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for Mac</h2>

-	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

+	    <em>Version <version-torbrowserbundleosx64> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

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

 	  </div>

 	  <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" style="margin-bottom: 5px;">

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

 	  </form>

 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>

@@ -61,7 +61,7 @@

 	  <div class="desc">

 	    <h2>Tor Browser for Mac</h2>

 	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

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

 	  </div>

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

@@ -75,6 +75,24 @@

 	  </form>

 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>

         </div>

+        <!-- To update these screenshots: Press Command-Shift-4 and then Spacebar, then click on the window. See #14838. -->

+        <table class="howto">

+          <tr>

+            <th>1. Install</th>

+            <th>2. Control-click</th>

+            <th>3. Open</th>

+          </tr>

+          <tr>

+            <td><img src="$(IMGROOT)/tbb-macosx-step-1.png" alt="Screenshot showing the contents of the Tor Browser dmg file."></td>

+            <td><img src="$(IMGROOT)/tbb-macosx-step-2.png" alt="Screenshot of the Applications folder with the Tor Browser icon."></td>

+            <td><img src="$(IMGROOT)/tbb-macosx-step-3.png" alt="Dialog offering to open Tor Browser."></td>

+          </tr>

+          <tr>

+            <td>Drag the Tor Browser icon to the Applications folder and open the Applications folder.</td>

+            <td>Control-click on the Tor Browser icon (click the mouse button while pressing the Control key on the keyboard) and choose &ldquo;Open&rdquo;.</td>

+            <td>Click &ldquo;Open&rdquo; on the next screen.</td>

+          </tr>

+        </table>

       </div>

 <!-- START LINUX -->

       <div id="linux" class="easy linux">

@@ -60,7 +60,7 @@

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for Mac</h2>

-	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em>

+	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

 	  <form class="downloads">

@@ -81,7 +81,7 @@

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for GNU/Linux</h2>

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

+	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />

 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

@@ -103,7 +103,7 @@

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

 	    <h2>Tor Browser for 64-Bit GNU/Linux</h2>

-	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em>

+	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

 	  <form class="downloads">

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

 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.</p>

+your anonymity and privacy.</p>

 </li>

 <li><b>Use HTTPS versions of websites</b>

@@ -48,7 +48,7 @@

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

 	  </form>

@@ -69,7 +69,7 @@

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

 	  </form>

@@ -91,7 +91,7 @@

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

 	  </form>

@@ -112,7 +112,7 @@

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

 	  </form>

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

 <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-lin-tbb32>Tor Browser Bundle</define-tag>

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

+<define-tag button-lin-tbb32>Tor Browser</define-tag>

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

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

@@ -38,7 +38,7 @@

       <div id="windows" class="easy windows">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

-	    <h2>Tor Browser Bundle for Windows</h2>

+	    <h2>Tor Browser for Windows</h2>

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

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

 	  </div>

@@ -59,7 +59,7 @@

       <div id="mac" class="easy mac">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

-	    <h2>Tor Browser Bundle for Mac</h2>

+	    <h2>Tor Browser for Mac</h2>

 	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em>

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

@@ -80,7 +80,7 @@

       <div id="linux" class="easy linux">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

-	    <h2>Tor Browser Bundle for GNU/Linux</h2>

+	    <h2>Tor Browser for GNU/Linux</h2>

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

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />

 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

@@ -102,7 +102,7 @@

       <div class="easy linux">

 	<div class="package" style="padding-top: 13px; border-top: 0px;">

 	  <div class="desc">

-	    <h2>Tor Browser Bundle for 64-Bit GNU/Linux</h2>

+	    <h2>Tor Browser for 64-Bit GNU/Linux</h2>

 	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em>

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

@@ -203,7 +203,7 @@ exactly as you are used to.</p>

 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

+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.</p>

@@ -236,7 +236,7 @@ that works for some videos.</p>

 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

+ensure private 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

@@ -64,13 +64,13 @@

 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>

 	  </div>

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

 	  </form>

 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>

@@ -243,8 +243,11 @@ support it. However, you should still watch the browser URL bar to

 ensure that websites you provide sensitive information to display a <a

 href="https://support.mozilla.com/en-US/kb/Site%20Identity%20Button">blue

 or green URL bar button</a>, include <b>https://</b> in the URL, and

-display the

-proper expected name for the website.</p>

+display the proper expected name for the website.

+Also see EFF's interactive page

+explaining <a href="https://www.eff.org/pages/tor-and-https">how Tor

+and HTTPS relate</a>.

+</p>

 </li>

 <li><b>Don't open documents downloaded through Tor while online</b>

@@ -233,7 +233,7 @@ that works for some videos.</p>

 <li><b>Use HTTPS versions of websites</b>

 <p>Tor will encrypt your traffic <a

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

+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

@@ -233,7 +233,7 @@ that works for some videos.</p>

 <li><b>Use HTTPS versions of websites</b>

 <p>Tor will encrypt your traffic <a

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

+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

@@ -295,7 +295,7 @@ the issues</a>.</p>

 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>

 <li class="dropdown"><a href="#mac">Apple OS X</a></li>

 <li class="dropdown"><a href="#linux">Linux/Unix</a></li>

-<li class="dropdown"><a href="../download/download.html.en">All Downloads</a></li>