diff --git a/doc/tor-doc-server.html b/doc/tor-doc-server.html
index 0506294157..15012617a0 100644
--- a/doc/tor-doc-server.html
+++ b/doc/tor-doc-server.html
@@ -46,7 +46,9 @@
at least 20 kilobytes/s each way, please help out Tor by configuring
your Tor to be a server too. Having servers in many different pieces
of the Internet gives users more robustness against curious telcos and
-brute force attacks.
+brute force attacks. You may also get stronger anonymity, since your
+destination can't know whether connections relayed through your computer
+originated at your computer or not.
diff --git a/doc/tor-doc-unix.html b/doc/tor-doc-unix.html
index 8051f4952b..d78892531a 100644
--- a/doc/tor-doc-unix.html
+++ b/doc/tor-doc-unix.html
@@ -44,9 +44,8 @@
Note that these are the installation instructions for running a Tor
-client.
-If you want to run a server (please do), read the "Configuring a server" section at
-tor-doc.html.
+client. If you want to run a server (please do), read the Configuring a server guide.
diff --git a/doc/tor-doc-win32.html b/doc/tor-doc-win32.html
index 2a84541d4a..0f72956d05 100644
--- a/doc/tor-doc-win32.html
+++ b/doc/tor-doc-win32.html
@@ -45,8 +45,8 @@
Note that these are the installation instructions for running a Tor
client on MS Windows (98, 98SE, NT4, 2000, XP, Server)
-If you want to run a server (please do), read the "Configuring a server" section at
-tor-doc.html.
+If you want to run a server (please do), read the Configuring a server guide.
diff --git a/doc/tor-doc.html b/doc/tor-doc.html
index 7d7998164f..e3bd46efff 100644
--- a/doc/tor-doc.html
+++ b/doc/tor-doc.html
@@ -91,68 +91,6 @@ all of these groups bother you? It shouldn't -- you need them for
your security.
-
-Should I run a client or a server?
-
-You can run Tor in either client mode or server mode. By default,
-everybody is a client. This means you don't relay traffic for
-anybody but yourself.
-
-If your computer doesn't have a routable IP address or you're using
-a modem, you should stay a client. Otherwise, please consider being
-a server, to help out the network. (Currently each server uses 20-500
-gigabytes of traffic per month, depending on its capacity and its rate
-limiting configuration.)
-
-Note that you can be a server without allowing users to make
-connections from your computer to the outside world. This is called being
-a middleman server.
-
- Benefits of running a server include:
-
-- You may get stronger anonymity, since your destination can't know
-whether connections relayed through your computer originated at your
-computer or not.
-
- You can also get stronger anonymity by configuring your Tor clients
-to use your Tor server for entry or for exit.
-
- You're helping the Tor staff with development and scalability testing.
-
- You're helping your fellow Internet users by providing a larger
-network. Also, having servers in many different pieces of the Internet
-gives users more robustness against curious telcos and brute force
-attacks.
-
-
-Other things to note:
-
-- Tor has built-in support for rate limiting; see BandwidthRate
-and BandwidthBurst config options. Further, if you have
-lots of capacity but don't want to spend that many bytes per
-month, check out the Accounting and Hibernation features. See the FAQ
-for details.
-- It's fine if the server goes offline sometimes. The directories
-notice this quickly and stop advertising the server. Just try to make
-sure it's not too often, since connections using the server when it
-disconnects will break.
-- We can handle servers with dynamic IPs just fine, as long as the
-server itself knows its IP. Have a look at this
-
-entry in the FAQ.
-- If your server is behind a NAT and it doesn't
-know its public IP (e.g. it has an IP of 192.168.x.y), you need to set
-up port forwarding. Forwarding TCP connections is system dependent but
-
-this entry offers some examples on how to do this.
-- Your server will passively estimate and advertise its recent
-bandwidth capacity.
-Clients choose paths weighted by this capacity, so high-bandwidth
-servers will attract more paths than low-bandwidth ones. That's why
-having even low-bandwidth servers is useful too.
-
-
-You can read more about setting up Tor as a
-server below.
-
Installing and configuring Tor
@@ -161,134 +99,16 @@ server below.
OS X, and Linux/BSD/Unix documentation guides.
+
Configuring a server
-We're looking for people with reasonably reliable Internet connections,
-that have at least 20 kilobytes/s each way. If you frequently have a
-lot of packet loss or really high latency, we can't handle your server
-yet. Otherwise, please help out!
-
-
-To read more about whether you should be a server, check out the section above.
+We've moved this section over to the new
+Tor Server
+Configuration Guide. Hope you like it.
-To set up a Tor server, do the following steps after installing Tor.
-(These instructions are Unix-centric; but Tor 0.0.9.5 and later is running
-as a server on Windows now as well.)
-
-
-
-- 0. Verify that your clock is set correctly. If possible, synchronize
-your clock with public time servers.
-- 1. Edit the bottom part of your torrc. (See this
-FAQ entry for help.)
-Make sure to define at least Nickname and ORPort.
-Create the DataDirectory if necessary, and make
-sure it's owned by the user that will be running tor.
-Make sure name resolution works.
-
- 2. If you are using a firewall, open a hole in your firewall so
-incoming connections can reach the ports you configured (i.e. ORPort,
-plus DirPort if you enabled it). Make sure you allow outgoing connections,
-to get to other onion routers plus any other addresses or ports your
-exit policy allows.
-
- 3. Start your server: if you installed from source you can just
-run tor, whereas packages typically launch Tor from their
-initscripts or startup scripts. If it logs any warnings, address them. (By
-default Tor logs to stdout, but some packages log to /var/log/tor/
-instead. You can edit your torrc to configure log locations.)
-
- 4. Once you are convinced it's working, Register your server.
-Send mail to tor-ops@freehaven.net with a
-subject of '[New Server] <your server's nickname>' and
-include the
-following information in the message:
-
-- Your server's nickname.
-- The fingerprint for your server's key (the contents of the
-"fingerprint" file in your DataDirectory -- look in /var/lib/tor or ~/.tor
-on many platforms).
-- Who you are, so we know whom to contact if a problem arises,
-and
-- What kind of connectivity the new server will have.
-
-If possible, sign your mail using PGP.
-Registering your server reserves your nickname so nobody else can take it,
-and lets us contact you if you need to upgrade or something goes wrong.
- - 5. Subscribe to the or-announce
-mailing list. It is very low volume, and it will keep you informed
-of new stable releases. You might also consider subscribing to or-talk (higher volume),
-where new development releases are announced.
-
-
-Here's where Tor puts its files on many common platforms:
-
- | Unix | Windows | Mac OS X |
|---|
-| Configuration |
- /etc/torrc
or /usr/local/etc/torrc |
- \username\Application Data\tor\torrc
or \Application Data\tor\torrc |
- /Library/Tor/torrc |
|---|
-| Fingerprint |
- /var/lib/tor/fingerprint
- or ~/.tor/fingerprint |
- \username\Application Data\tor\fingerprint
- or \Application Data\tor\fingerprint |
- /Library/Tor/var/lib/tor/fingerprint |
|---|
-| Logs |
- /var/log/tor
- or /usr/local/var/log/tor |
- \username\Application Data\tor\log
- or \Application Data\tor\log |
- /var/log/tor |
|---|
-
-
-
-
-Optionally, we recommend the following steps as well:
-
-
-
-- 6 (Unix only). Make a separate user to run the server. If you
-installed the deb or the rpm, this is already done. Otherwise,
-you can do it by hand. (The Tor server doesn't need to be run as
-root, so it's good practice to not run it as root. Running as a
-'tor' user avoids issues with identd and other services that
-detect user name. If you're the paranoid sort, feel free to put Tor
-into a chroot jail.)
-
- 7. Decide what exit policy you want. By default your server allows
-access to many popular services, but we restrict some (such as port 25)
-due to abuse potential. You might want an exit policy that is
-less restrictive or more restrictive; edit your torrc appropriately.
-If you choose a particularly open exit policy, you might want to make
-sure your upstream or ISP is ok with that choice.
-
- 8. If you installed from source, you may find the initscripts in
-contrib/tor.sh or contrib/torctl useful if you want to set up Tor to
-start at boot.
-
- 9. Consider setting your hostname to 'anonymous' or
-'proxy' or 'tor-proxy' if you can, so when other people see the address
-in their web logs or whatever, they will more quickly understand what's
-going on.
-
- 10. If you're not running anything else on port 80 or port 443,
-please consider setting up port-forwarding and advertising these
-low-numbered ports as your Tor server. This will help allow users behind
-particularly restrictive firewalls to access the Tor network. Win32
-servers can simply set their ORPort and DirPort directly. Other servers
-need to rig some sort of port forwarding; see the
-FAQ for details of how to set this up.
-
-
-You can click here or here and look at the router-status
-line to see if your server is part of the network. It will be listed by
-nickname once we have added your server to the list of known servers;
-otherwise it is listed only by its fingerprint.
-
Configuring a hidden service
@@ -339,3 +159,4 @@ have to restart the process).