tor-webwml.git

@@ -69,7 +69,7 @@ configuration for Tor has been installed as part of the installer package.

 <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

 <br />

-<p>After installing Tor and Privoxy, you need to configure your

+<p>After installing, you need to configure your

 applications to use them. The first step is to set up web browsing.</p>

 <p>You should use Tor with Firefox and Torbutton, for best safety.

@@ -87,7 +87,7 @@ entry for running Tor on a different computer</a>.

 </p>

 <p>To Torify other applications that support HTTP proxies, just

-point them at Privoxy (that is, localhost port 8118). To use SOCKS

+point them at Polipo (that is, localhost port 8118). 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="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this

@@ -40,8 +40,8 @@ src="../img/screenshot-win32-firefox-proxies.jpg" />

 <p>

 You should fill in "localhost"

-and "8118" to point the top four protocols to Privoxy, as shown here. (Even

-though Privoxy doesn't support FTP and Gopher, <a

+and "8118" to point the top four protocols to Polipo, as shown here. (Even

+though Polipo doesn't support FTP and Gopher, <a

 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FtpProxy">you

 should set them up anyway</a>.) You should also fill out the socks proxy entry to point directly to Tor ("localhost", "9050", and socks5)

 to cover protocols besides the first four. Then click "OK".</p>

@@ -17,7 +17,7 @@ IP address to its users. In fact, because you don't use any public address,

 you can run a hidden service from behind your firewall.

 </p>

-<p>If you have Tor and Privoxy installed, you can see hidden services

+<p>If you have Tor installed, you can see hidden services

 in action by visiting <a href="http://duskgytldkxiuqc6.onion/">our

 example hidden service</a> or the <a

 href="http://gaddbiwdftapglkq.onion/">Wikileaks hidden service</a>.

@@ -30,14 +30,12 @@ works, see our <a href="<page hidden-services>">hidden service protocol</a> page

 <hr />

 <a id="zero"></a>

-<h2><a class="anchor" href="#zero">Step Zero: Get Tor and Privoxy working</a></h2>

+<h2><a class="anchor" href="#zero">Step Zero: Get Tor working</a></h2>

 <br />

 <p>Before you start, you need to make sure:</p>

 <ol>

 <li>Tor is up and running,</li>

-<li>Privoxy is up and running,</li>

-<li>Privoxy is configured to point to Tor and</li>

 <li>You actually set it up correctly.</li>

 </ol>

@@ -50,7 +48,7 @@ X howto</a>, and Linux/BSD/Unix users should follow the <a

 href="<page docs/tor-doc-unix>">Unix howto</a>.

 </p>

-<p>Once you've got Tor and Privoxy installed and configured,

+<p>Once you've got Tor installed and configured,

 you can see hidden services in action by following this link to <a

 href="http://duskgytldkxiuqc6.onion/">our example hidden service</a>

 or the <a

@@ -59,7 +57,7 @@ It will typically take 10-60 seconds to load

 (or to decide that it is currently unreachable). If it fails

 immediately and your browser pops up an alert saying that

 "www.duskgytldkxiuqc6.onion could not be found, please check the name and

-try again" then you haven't configured Tor and Privoxy correctly; see <a

+try again" then you haven't configured Tor correctly; see <a

 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">the

 it-doesn't-work FAQ entry</a> for some help.

 </p>

@@ -69,7 +69,7 @@ to report a Tor bug</a> first and then tell us as much information

 about it as you can in

 <a href="https://bugs.torproject.org/tor">our bugtracker</a>.

 (If your bug is

-with Privoxy, your browser, or some other application, please don't put

+with Polipo, your browser, or some other application, please don't put

 it in our bugtracker.) The

 <a href="#MailingLists">or-talk mailing list</a> can also be useful.

 </li>

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

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

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

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

-and <a href="http://www.privoxy.org/">Privoxy</a>, which are supporting

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

 applications distributed under the GNU GPL.

 </p>

 <p>

@@ -259,7 +259,7 @@ with whatever part of the Tor software you're distributing.

 <p>

 Most people who ask us this question don't want to distribute just the

 Tor software, though. They want to distribute the Tor bundles, which

-typically include <a href="http://www.privoxy.org/">Privoxy</a>

+typically include <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>

 and <a href="<page vidalia/index>">Vidalia</a>.

 You will need to follow the licenses for those programs

 as well. Both of them are distributed under the <a

@@ -268,7 +268,7 @@ Public License</a>. The simplest way to obey their licenses is to

 include the source code for these programs everywhere you include

 the bundles themselves. Look for "source" packages on the <a

 href="<page vidalia/index>">Vidalia page</a> and the <a

-href="http://sourceforge.net/project/showfiles.php?group_id=11118">Privoxy

+href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo

 download page</a>.

 </p>

@@ -296,7 +296,7 @@ Tor support mail?</a></h3>

 Many people send the Tor developers mail privately, or send mail to

 our internal <a href="<page contact>">lists</a>, with questions about their

 specific setup — they can't get their firewall working right,

-they can't configure Privoxy correctly, or so on. Sometimes our

+they can't configure Polipo correctly, or so on. Sometimes our

 volunteers can answer these mails, but typically they need to spend

 most of their time on development tasks that will benefit more people.

 This is especially true if your question is already covered in the <a

@@ -528,26 +528,24 @@ director for information on making grants or major donations.

 This depends entirely on how you installed it and which operating system you

 have. If you installed a package, then hopefully your package has a way to

 uninstall itself. The Windows packages include uninstallers. The proper way to

-completely remove Tor, Vidalia, Torbutton for Firefox, and Privoxy on any

+completely remove Tor, Vidalia, Torbutton for Firefox, and Polipo on any

 version of Windows is as follows:

 </p>

 <ol>

-<li>In your taskbar, right click on Privoxy (the blue icon with a white "P")

-and choose exit.</li>

 <li>In your taskbar, right click on Vidalia (the green onion or the black head)

 and choose exit.</li>

 <li>Right click on the taskbar to bring up TaskManager. Look for tor.exe in the

 Process List. If it's running, right click and choose End Process.</li>

 <li>Click the Start button, go to Programs, go to Vidalia, choose Uninstall.

-This will remove the Vidalia bundle, which includes Tor and Privoxy.</li>

+This will remove the Vidalia bundle, which includes Tor and Polipo.</li>

 <li>Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.

 Click the Uninstall button.</li>

 </ol>

 <p>

 If you do not follow these steps (for example by trying to uninstall

-Vidalia, Tor, and Privoxy while they are still running), you will need to

+Vidalia, Tor, and Polipo while they are still running), you will need to

 reboot and manually remove the directory "Program Files\Vidalia Bundle".

 </p>

@@ -690,7 +688,7 @@ other LiveCDs (Tor related or otherwise). You can obtain more information and

 download Anonym.OS from <a

 href="http://theory.kaos.to/projects.html">Kaos.Theory</a>.</li>

 <li>Phantomix is a LiveCD for anonymous surfing and chatting based on the most

-recent KNOPPIX release. It comes preconfigured with tor and privoxy. You can

+recent KNOPPIX release. It comes preconfigured with privoxiTor and Polipo. You can

 get it from the <a href="http://phantomix.ytternhagen.de/">Phantomix

 Website</a>.</li>

 </ol>