From 0c0a504611c794fe01ea3d709f596bacb9821f28 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 21 Dec 2004 05:43:17 +0000 Subject: [PATCH] capitalize acronyms, clarify windows doc a bit. svn:r3197 --- doc/socks-extensions.txt | 2 +- doc/tor-doc-win32.html | 30 +++++++++++++++++------------- doc/tor-doc.html | 12 ++++++------ doc/tor-resolve.1 | 4 ++-- doc/tor-spec.txt | 4 ++-- doc/tor.1.in | 4 ++-- 6 files changed, 30 insertions(+), 26 deletions(-) diff --git a/doc/socks-extensions.txt b/doc/socks-extensions.txt index b2988ef5c3..2cb6f7f8c5 100644 --- a/doc/socks-extensions.txt +++ b/doc/socks-extensions.txt @@ -48,7 +48,7 @@ Tor's extensions to the SOCKS protocol 3. HTTP-resistance - Tor checks the first byte of each socks request to see whether it looks + Tor checks the first byte of each SOCKS request to see whether it looks more like an HTTP request (that is, it starts with a "G", "H", or "P"). If so, Tor returns a small webpage, telling the user that his/her browser is misconfigured. This is helpful for the many users who mistakenly try to diff --git a/doc/tor-doc-win32.html b/doc/tor-doc-win32.html index 97f6927b20..4edeb9bfa6 100644 --- a/doc/tor-doc-win32.html +++ b/doc/tor-doc-win32.html @@ -9,10 +9,10 @@ -

Tor for Win32

+

Running Tor on Win32

-

Installing Tor

+

Step One: Download and Install Tor

The latest stable release of Tor for Windows 32 is default configuration file, and most people won't need to change any of the settings. Tor is now installed.

- -

Configuring your applications to use Tor

+ +

Step Two: Install Privoxy for Web Browsing

After installing Tor, you need to configure your applications to use it. The first step is to set up web browsing. Start by installing -

Then change your browser to http proxy at localhost port 8118. + +

Step three: Configure your applications to use Tor

+ +

Then change your browser to HTTP proxy at localhost port 8118. +(That's where Privoxy listens.) In Mozilla, this is in Edit|Preferences|Advanced|Proxies. In IE, it's Tools|Internet Options|Connections|LAN Settings|Advanced. You should also set your SSL proxy (IE calls it "Secure") to the same @@ -94,9 +98,9 @@ src="http://tor.freehaven.net/img/screenshot-ie-lan.jpg" /> Proxy settings in IE -

Using privoxy is necessary because Using privoxy is necessary because browsers leak your -DNS requests when they use a socks proxy directly, which is bad for +DNS requests when they use a SOCKS proxy directly, which is bad for your anonymity. Privoxy also removes certain dangerous headers from your web requests, and blocks obnoxious ad sites like Doubleclick.

@@ -114,16 +118,17 @@ For more troubleshooting suggestions, see the FAQ.

-

To Torify an application that supports http, just point it at Privoxy -(that is, localhost port 8118). To use socks directly (for example, for +

To Torify another application that supports HTTP, just point it at Privoxy +(that is, localhost port 8118). To use SOCKS directly (for example, for instant messaging, Jabber, IRC, etc), point your application directly at -Tor (localhost port 9050). For applications that support neither socks -nor http, take a look at SocksCap, FreeCap, or the Hummingbird -SOCKS client. Let us know if you get them working so we can add better +SOCKS client. (FreeCap is free software; the others are proprietary.) +Let us know if you get them working so we can add better instructions here.

If you have suggestions for improving this document, please send them to us. Thanks!

- diff --git a/doc/tor-doc.html b/doc/tor-doc.html index af6a5e7617..6eccc5d9ca 100644 --- a/doc/tor-doc.html +++ b/doc/tor-doc.html @@ -165,7 +165,7 @@ top). Then change your browser to http proxy at localhost port 8118. You should also set your SSL proxy to the same thing, to hide your SSL traffic. Using privoxy is necessary because Mozilla leaks your -DNS requests when it uses a socks proxy directly. Privoxy also gives +DNS requests when it uses a SOCKS proxy directly. Privoxy also gives you good html scrubbing.

To test if it's working, go to +to support SOCKS but does not. --> For more troubleshooting suggestions, see the FAQ.

To Torify an application that supports http, just point it at Privoxy -(that is, localhost port 8118). To use socks directly (for example, for +(that is, localhost port 8118). To use SOCKS directly (for example, for instant messaging, Jabber, IRC, etc), point your application directly at -Tor (localhost port 9050). For applications that support neither socks +Tor (localhost port 9050). For applications that support neither SOCKS nor http, you should look at using tsocks to dynamically replace the system calls in your program to -route through Tor. If you want to use socks4a, consider using socat (specific instructions are on this hidden service url).

@@ -323,7 +323,7 @@ in /usr/local/etc/tor/), and edit the middle part. Then run Tor. It will create each HiddenServiceDir you have configured, and it will create a 'hostname' file which specifies the url (xyz.onion) for that service. You can tell people the url, and they can connect to it via their Tor client, -assuming they're using a proxy (such as Privoxy) that speaks socks4a.

+assuming they're using a proxy (such as Privoxy) that speaks SOCKS 4A.

Setting up your own network

diff --git a/doc/tor-resolve.1 b/doc/tor-resolve.1 index 9c25f4475d..e1e3dc4f29 100644 --- a/doc/tor-resolve.1 +++ b/doc/tor-resolve.1 @@ -8,8 +8,8 @@ tor-resolve \- resolve a hostname to an IP address via tor \fBtor-resolve\fP\ [-4|-5] \fIhostname\fP\ [\fIsockshost\fP[:\fIsocksport]\fP] .SH DESCRIPTION -\fBtor-resolve\fR is a simple script to connect to a socks proxy that -knows about the socks RESOLVE command, hand it a hostname, and return +\fBtor-resolve\fR is a simple script to connect to a SOCKS proxy that +knows about the SOCKS RESOLVE command, hand it a hostname, and return an IP address. .SH SEE ALSO diff --git a/doc/tor-spec.txt b/doc/tor-spec.txt index 073c685f41..58aa296dec 100644 --- a/doc/tor-spec.txt +++ b/doc/tor-spec.txt @@ -838,7 +838,7 @@ entries. 7.4. Behavior of a directory server lists nodes that are connected currently -speaks http on a socket, spits out directory on request +speaks HTTP on a socket, spits out directory on request Directory servers listen on a certain port (the DirPort), and speak a limited version of HTTP 1.0. Clients send either GET or POST commands. @@ -852,7 +852,7 @@ The basic interactions are: request containing the descriptor. "host" is used to specify the address:port of the dirserver, so - the request can survive going through http proxies. + the request can survive going through HTTP proxies. A.1. Differences between spec and implementation diff --git a/doc/tor.1.in b/doc/tor.1.in index b548b58e26..f8d0ebd5bc 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -186,10 +186,10 @@ Set this to 0 if you don't want to allow application connections. (Default: 9050) .TP \fBSOCKSBindAddress \fR\fIIP\fP -Bind to this address to listen for connections from socks-speaking applications. (Default: 127.0.0.1) You can also specify a port (e.g. 192.168.0.1:9100). This directive can be specified multiple times to bind to multiple addresses/ports. +Bind to this address to listen for connections from SOCKS-speaking applications. (Default: 127.0.0.1) You can also specify a port (e.g. 192.168.0.1:9100). This directive can be specified multiple times to bind to multiple addresses/ports. .TP \fBSOCKSPolicy \fR\fIpolicy\fR,\fIpolicy\fR,\fI...\fP -Set an entrance policy for this server, to limit who can connect to the socks ports. The policies have the same form as exit policies below. +Set an entrance policy for this server, to limit who can connect to the SOCKS ports. The policies have the same form as exit policies below. .SH SERVER OPTIONS .PP