tor-webwml.git

@@ -221,8 +221,8 @@

     Tor can't solve all anonymity problems.  It focuses only on

     protecting the transport of data.  You need to use protocol-specific

     support software if you don't want the sites you visit to see your

-    identifying information. For example, you can use the <a href="<page

-    projects/torbrowser>">Tor Browser Bundle</a>

+    identifying information. For example, you can use <a href="<page

+    projects/torbrowser>">Tor Browser</a>

     while browsing the web to withhold some information about your computer's

     configuration.

     </p>

@@ -36,7 +36,7 @@

     </li>

     <li>

-    <a href="<page download/download>">Install the Tor Browser Bundle</a> and try it out.

+    <a href="<page download/download>">Install Tor Browser</a> and try it out.

     Be sure to read the

     <a href="<page download/download>#Warning">list of warnings</a> about ways you

     can screw up your anonymity. Look through the <a

@@ -16,8 +16,8 @@

     <p><a href="#General">General questions:</a><br />

     <a href="#CompilationAndInstallation">Compilation and Installation:</a><br />

-    <a href="#TBBGeneral">Tor Browser Bundle (general):</a><br />

-    <a href="#TBB3.x">Tor Browser Bundle (3.x series):</a><br />

+    <a href="#TBBGeneral">Tor Browser (general):</a><br />

+    <a href="#TBB3.x">Tor Browser (3.x and later):</a><br />

     <a href="#AdvancedTorUsage">Advanced Tor usage:</a><br />

     <a href="#RunningATorRelay">Running a Tor relay:</a><br />

     <a href="#TorHiddenServices">Tor hidden services:</a><br />

@@ -74,7 +74,7 @@ proxies?</a></li>

 includes Tor?</a></li>

     </ul>

-    <p>Tor Browser Bundle (general):</p>

+    <p>Tor Browser (general):</p>

     <ul>

     <li><a href="#TBBFlash">Why can't I view videos on YouTube and other

@@ -88,7 +88,7 @@ error message: "Cannot load XPCOM".</a></li>

     <li><a href="#TBBOtherExtensions">Can I install other Firefox

     extensions? Which extensions should I avoid using?</a></li>

     <li><a href="#TBBJavaScriptEnabled">Why is NoScript configured to

-allow JavaScript by default in the Tor Browser Bundle?  Isn't that

+allow JavaScript by default in Tor Browser?  Isn't that

 unsafe?</a></li>

     <li><a href="#TBBOtherBrowser">I want to use Chrome/IE/Opera/etc

     with Tor.</a></li>

@@ -106,7 +106,7 @@ unsafe?</a></li>

     with my application?</a></li>

     </ul>

-    <p>Tor Browser Bundle (3.x series):</p>

+    <p>Tor Browser (3.x and later):</p>

     <ul>

     <li><a href="#WhereDidVidaliaGo">Where did the world map (Vidalia)

@@ -119,8 +119,8 @@ unsafe?</a></li>

     <li><a href="#ConfigureRelayOrBridge">How do I configure Tor as a relay

     or bridge?</a></li>

     <li><a href="#Timestamps">Why are the file timestamps from 2000?</a></li>

-    <li><a href="#TBBSourceCode">Where is the source code for the bundle? How do

-    I verify a build?</a></li>

+    <li><a href="#TBBSourceCode">Where is the source code for Tor Browser? 

+    How do I verify a build?</a></li>

     </ul>

     <p>Advanced Tor usage:</p>

@@ -432,8 +432,8 @@ encryption, what data you're sending to the destination.</dd>

 can I use with Tor?</a></h3>

     <p>

-    If you want to use Tor with a web browser, we provide the Tor Browser

-    Bundle, which includes everything you need to browse the web safely using

+    If you want to use Tor with a web browser, we provide the Tor Browser,

+    which includes everything you need to browse the web safely using

     Tor. If you want to use another web browser with Tor, see <a

     href="#TBBOtherBrowser">Other web browsers</a>.

     </p>

@@ -919,8 +919,8 @@ executive

     </a></h3>

     <p>

-    Use the <a href="https://torproject.org/projects/torbrowser.html">Tor

-    Browser Bundle</a>. If you want a separate application for an

+    Use <a href="https://torproject.org/projects/torbrowser.html">Tor

+    Browser</a>. If you want a separate application for an

     ftp client, we've heard good things about  FileZilla for Windows. You can

     configure it to point to Tor as a "socks4a" proxy on "localhost" port

     "9050".

@@ -934,7 +934,7 @@ executive

     <p>No, it doesn't. You need to use a separate program that understands

     your application and protocol and knows how to clean or "scrub" the data

-    it sends. The Tor Browser Bundle tries to keep application-level data,

+    it sends. The Tor Browser tries to keep application-level data,

     like the user-agent string, uniform for all users. The Tor Browser can't

     do anything about text that you type into forms, though. <a

     href="<page download/download-easy>#warning">Be

@@ -1045,8 +1045,8 @@ country. How do I download Tor?</a></h3>

 <p>

 Some government or corporate firewalls censor connections to Tor's

 website. In those cases, you have three options. First, get it from

-a friend &mdash; the <a href="<page projects/torbrowser>">Tor Browser

-Bundle</a> fits nicely on a USB key. Second, find the <a

+a friend &mdash; <a href="<page projects/torbrowser>">Tor Browser</a> 

+fits nicely on a USB key. Second, find the <a

 href="https://encrypted.google.com/search?q=tor+mirrors">google

 cache</a>

 for the <a href="<page getinvolved/mirrors>">Tor mirrors</a> page

@@ -1105,15 +1105,13 @@ bundle that includes Tor?</a></h3>

     <p>

     Yes.  Use <a href="https://tails.boum.org/">The Amnesic Incognito

-    Live System</a> or <a href="<page projects/torbrowser>">the Tor

-Browser

-    Bundle</a>.

+    Live System</a> or <a href="<page projects/torbrowser>">Tor Browser</a>.

     </p>

 <hr>

 <a id="TBBGeneral"></a>

-<h2><a class="anchor">Tor Browser Bundle (general):</a></h2>

+<h2><a class="anchor">Tor Browser (general):</a></h2>

 <a id="TBBFlash"></a>

 <h3><a class="anchor" href="#TBBFlash">Why can't I view videos on

@@ -1201,14 +1199,14 @@ Firefox extensions?</a></h3>

 <p>

 The Tor Browser is free software, so there is nothing preventing you from

 modifying it any way you like. However, we do not recommend installing any

-additional Firefox add-ons with the Tor Browser Bundle. Add-ons can break

+additional Firefox add-ons with Tor Browser. Add-ons can break

 your anonymity in a number of ways, including browser fingerprinting and

 bypassing proxy settings.

 </p>

 <p>

 Some people have suggested we include ad-blocking software or

-anti-tracking software with the Tor Browser Bundle. Right now, we do not

-think that's such a good idea. The Tor Browser Bundle aims to provide

+anti-tracking software with the Tor Browser. Right now, we do not

+think that's such a good idea. Tor Browser aims to provide

 sufficient privacy that additional add-ons to stop ads and trackers are

 not necessary. Using add-ons like these may cause some sites to break, which

 <a href="https://www.torproject.org/projects/torbrowser/design/#philosophy">

@@ -1222,12 +1220,12 @@ users.

 <a id="TBBJavaScriptEnabled"></a>

 <a id="TBBCanIBlockJS"></a>

 <h3><a class="anchor" href="#TBBJavaScriptEnabled">Why is NoScript

-configured to allow JavaScript by default in the Tor Browser Bundle?

+configured to allow JavaScript by default in Tor Browser?

 Isn't that unsafe?</a></h3>

 <p>

-We configure NoScript to allow JavaScript by default in the Tor

-Browser Bundle because many websites will not work with JavaScript

+We configure NoScript to allow JavaScript by default in Tor

+Browser because many websites will not work with JavaScript

 disabled.  Most users would give up on Tor entirely if a website

 they want to use requires JavaScript, because they would not know

 how to allow a website to use JavaScript (or that enabling

@@ -1478,7 +1476,7 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed

 <hr>

 <a id="TBB3.x"></a>

-<h2><a class="anchor">Tor Browser Bundle (3.x series):</a></h2>

+<h2><a class="anchor">Tor Browser (3.x and later):</a></h2>

     <a id="WhereDidVidaliaGo"></a>

     <h3><a class="anchor" href="#WhereDidVidaliaGo">Where did the world map

     (Vidalia) go?</a></h3>

@@ -1641,7 +1639,7 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed

     from 2000?</a></h3>

     <p>One of the huge new features in TBB 3.x is the "deterministic build"

-    process, which allows many people to build the Tor Browser Bundle and

+    process, which allows many people to build Tor Browser and

     verify that they all make exactly the same package. See Mike's <a

     href="https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise">first

     blog</a> post for the motivation, and his <a

@@ -1656,7 +1654,8 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed

     <hr>

     <a id="TBBSourceCode"></a>

-    <h3><a class="anchor" href="#TBBSourceCode">Where is the source code for the bundle? How do I verify a build?</a></h3>

+    <h3><a class="anchor" href="#TBBSourceCode">Where is the source code for 

+    Tor Browser? How do I verify a build?</a></h3>

     <p>

     Start with <a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git">https://gitweb.torproject.org/builders/tor-browser-bundle.git</a> and <a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/README.build">https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/README.build</a>.

@@ -1678,9 +1677,9 @@ instructions for how your Tor program should behave. The default

 configuration should work fine for most Tor users.

 </p>

 <p>

-If you installed Tor Browser Bundle, look for

-<code>Data/Tor/torrc</code> inside your Tor Browser Bundle directory.

-On OS X, you must right-click or command-click on the browser bundle icon,

+If you installed Tor Browser, look for

+<code>Data/Tor/torrc</code> inside your Tor Browser directory.

+On OS X, you must right-click or command-click on the Tor Browser icon,

 and select "Show Package Contents" before the Tor Browser directories become

 visible.

 </p>

@@ -1810,12 +1809,12 @@ their logs.

 working.</a></h3>

 <p>

-Once you've got the Tor bundle up and running, the first question to

+Once you've got Tor Browser up and running, the first question to

 ask is whether your Tor client is able to establish a circuit.

 </p>

 <p>If Tor can establish a circuit, the onion icon in

-Vidalia will turn green (and if you're running Tor Browser Bundle, it

+Vidalia will turn green (and if you're running Tor Browser, it

 will

 automatically launch a browser for you). You can also check in the

 Vidalia

@@ -3542,9 +3541,9 @@ diversity,

     these technologies must be disabled in your browser to use Tor safely.

     </p>

     <p>

-    That's where the <a

-    href="<page projects/torbrowser>">Tor Browser

-    Bundle</a> comes in. We produce a web browser that is preconfigured to

+    That's where <a

+    href="<page projects/torbrowser>">Tor Browser</a> comes in. We produce 

+    a web browser that is preconfigured to

     help you control the risks to your privacy and anonymity while browsing

     the Internet. Not only are the above technologies disabled to prevent

     identity leaks, the Tor Browser also includes browser extensions like

@@ -46,7 +46,7 @@

     <p>Alas, since Vidalia (a graphical interface for Tor) is <a

     href="<page docs/faq>#WhereDidVidaliaGo">no longer included</a>

-    in the standard Tor Browser Bundle, there are currently no

+    in Tor Browser, there are currently no

     easy relay packages for OS X users. One option might be to run

     Debian in a VM, or use a different means of getting a Tor binary on

     your system (Homebrew, Macports). Please help make this process

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

     <br>

     <h2>Note that these are the installation instructions for running a

-    Tor client. The easiest way to do this is to simply download the <a

-    href="<page projects/torbrowser>">Tor Browser Bundle</a> and you are

+    Tor client. The easiest way to do this is to simply download <a

+    href="<page projects/torbrowser>">Tor Browser</a> and you are

     done.

     </h2>

@@ -56,7 +56,7 @@

     <br>

     <p>

-    If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

+    If you want to use Tor for anonymous web browsing, please use <a href="<page projects/torbrowser>">Tor Browser</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

     you can point your application directly at Tor (localhost

     port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ

     entry</a> for why this may be dangerous. For applications

@@ -67,7 +67,7 @@

     you will need to tell Windows the full path to the GnuPG program. If

     you installed GnuPG with the default values, the path should be

     something like this: <i>C:\Program Files\Gnu\GnuPg\gpg.exe</i>.</p>

-    <p>Erinn Clark signs the Tor Browser Bundles. Import her key

+    <p>Erinn Clark signs the Tor Browsers. Import her key

     (0x416F061063FEE659) by starting <i>cmd.exe</i> and typing:</p>

     <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x416F061063FEE659</pre>

     <p>After importing the key, you can verify that the fingerprint

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

     </p>

     <p>Once it's installed, use GnuPG to import the key that signed

-    your package. Erinn Clark signs the Tor Browser Bundles. Import her

+    your package. Erinn Clark signs the Tor Browsers. Import her

     key (0x416F061063FEE659) by starting the terminal (under "Applications")

     and typing:</p>

@@ -188,13 +188,13 @@

     <hr>

     <p>Build reproducibility is a <a 

        href="https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise">security 

-       property</a> of Tor Browser Bundle 3.0 and later. Anyone can build the 

-       Tor Browser Bundle on their own machine and produce a binary that is 

+       property</a> of Tor Browser 3.0 and later. Anyone can build 

+       Tor Browser on their own machine and produce a binary that is 

        bit-for-bit identical to the binary we offer on the download page. 

        Fortunately, it is not necessary for everyone to build the Tor Browser 

        locally to get this security. Verifying and comparing the signed list 

        of <a href="https://en.wikipedia.org/wiki/Cryptographic_hash">hashes</a> 

-       will confirm that multiple people have built Tor Browser Bundles 

+       will confirm that multiple people have built Tor Browsers 

        identical to the download.</p>

       <p>The steps below walk through this process:</p>

@@ -233,7 +233,7 @@

     <p><a href="https://github.com/isislovecruft/scripts/blob/master/verify-gitian-builder-signatures">Scripts</a> 

     to <a href="http://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle-tbb-3-x">automate</a> 

     these steps have been written, but to use them you will need to modify 

-    them yourself with the latest Tor Browser Bundle filename.</p>

+    them yourself with the latest Tor Browser filename.</p>

     <hr>

@@ -88,18 +88,18 @@

     <p>

     Torbutton is the component in <a href="<page projects/torbrowser>">Tor

-    Browser Bundle</a> that takes care of application-level

+    Browser</a> that takes care of application-level

     security and privacy concerns in Firefox.  To keep you safe,

     Torbutton disables many types of active content.

     </p>

     <p>

-    Now that the <a href="<page projects/torbrowser>">Tor Browser

-    Bundle</a> includes a patched version of Firefox, and because we don't

+    Now that the <a href="<page projects/torbrowser>">Tor Browser</a>

+    includes a patched version of Firefox, and because we don't

     have enough developer resources to keep up with the accelerated

     Firefox release schedule, the toggle model of Torbutton is <a

     href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no

-    longer supported</a>. <b>Users should be using Tor Browser Bundle,

+    longer supported</a>. <b>Users should be using Tor Browser,

     not installing Torbutton themselves.</b>

     </p>

@@ -17,18 +17,18 @@

     <p>

     Torbutton is the component in <a href="<page projects/torbrowser>">Tor

-    Browser Bundle</a> that takes care of application-level

+    Browser</a> that takes care of application-level

     security and privacy concerns in Firefox.  To keep you safe,

     Torbutton disables many types of active content.

     </p>

     <p>

-    Now that the <a href="<page projects/torbrowser>">Tor Browser

-    Bundle</a> includes a patched version of Firefox, and because we don't

+    Now that the <a href="<page projects/torbrowser>">Tor Browser</a> 

+    includes a patched version of Firefox, and because we don't

     have enough developer resources to keep up with the accelerated

     Firefox release schedule, the toggle model of Torbutton is <a

     href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no

-    longer supported</a>. <b>Users should be using Tor Browser Bundle,

+    longer supported</a>. <b>Users should be using Tor Browser,

     not installing Torbutton themselves.</b>

     </p>

@@ -17,18 +17,18 @@

     <p>

     Torbutton is the component in <a href="<page projects/torbrowser>">Tor

-    Browser Bundle</a> that takes care of application-level

+    Browser</a> that takes care of application-level

     security and privacy concerns in Firefox.  To keep you safe,

     Torbutton disables many types of active content.

     </p>

     <p>

-    Now that the <a href="<page projects/torbrowser>">Tor Browser

-    Bundle</a> includes a patched version of Firefox, and because we don't

+    Now that the <a href="<page projects/torbrowser>">Tor Browser</a>

+    includes a patched version of Firefox, and because we don't

     have enough developer resources to keep up with the accelerated

     Firefox release schedule, the toggle model of Torbutton is <a

     href="https://blog.torproject.org/blog/toggle-or-not-toggle-end-torbutton">no

-    longer supported</a>. <b>Users should be using Tor Browser Bundle,

+    longer supported</a>. <b>Users should be using Tor Browser,

     not installing Torbutton themselves.</b>

     </p>

     </div>

@@ -111,10 +111,7 @@ serious reliability and security bugs in these downloads.  Please be prepared to

 <div class="nb">

 <p>

 Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>

-under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. The

-bundles also include <a href="<page projects/vidalia>">Vidalia</a>

-and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>, which are supporting

-applications distributed under the GNU GPL.

+under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. 

 </p>

 <p>

 There is no fee for installing Tor, or using the Tor network, but

@@ -18,8 +18,8 @@ experience safer and better.</p>

 src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon" width="75"

 height="75"></a>

 <div class="projectdesc"><div class="name"><a href="<page

-projects/torbrowser>">Tor Browser Bundle</a></div> <p>The Tor Browser

-Bundle contains everything you need to safely browse the Internet. This

+projects/torbrowser>">Tor Browser</a></div> <p>The Tor Browser

+contains everything you need to safely browse the Internet. This

 package requires no installation. Just extract it and run.</p>

 </div></div>