@@ -10,118 +10,7 @@

     <a href="<page docs/tor-doc-relay>">Configure Tor Relay</a>

   </div>

   <div id="maincol">

-

-    <h1>Configuring a Tor relay</h1>

-

-    <hr>

-

-    <p>

-    The Tor network relies on volunteers to donate bandwidth. The more

-    people who run relays, the faster the Tor network will be. If you have

-    at least 2 megabits/s for both upload and download, please help out

-    Tor by configuring your Tor to be a relay too.

-    </p>

-

-    <p>You can run a Tor relay on pretty much any operating system. Tor relays

-    work best on current distributions of Linux, FreeBSD, NetBSD, and

-    Windows Server.

-    </p>

-

-    <p>

-    The best approach for most users is to <a href="<page

-    docs/tor-relay-debian>">run your relay on Debian or Ubuntu</a> using

-    the system Tor package — the deb takes care of running Tor as a

-    separate user, making sure it has enough file descriptors available,

-    starting it at boot, and so on. Tor relays also run nicely on other

-    Linux flavors, and on FreeBSD and NetBSD for those who are comfortable

-    with those operating systems.

-    </p>

-

-    <hr>

-    <a id="torrc"></a>

-    <h2><a class="anchor" href="#torrc">Configure Tor by editing the torrc file</a></h2>

-    <br />

-

-    <p>

-    Tor's

-    configuration file is named 'torrc'.</p>

-    <p>Locate the file on your system, open it with a text editor and add the

-    following lines:</p>

-

-    <pre>

-    ORPort 443

-    Exitpolicy reject *:*

-    Nickname ididntedittheconfig

-    ContactInfo human@...

-    </pre>

-

-# TODO: Update link to PT setup docs

-    <p>If you want to be a bridge, read about the BridgeRelay and

-    ServerTransportPlugin values <a

-    href="<page docs/pluggable-transports>">on

-    this page</a>.</p>

-

-    <p>Tor will use all your bandwidth if you don't set limits for it. Some

-    options are described in <a href="<page docs/faq>#LimitTotalBandwidth">these</a>

-    <a href="<page docs/faq>#BandwidthShaping">FAQ entries</a>.</p>

-

-    <p>See the <a href="https://gitweb.torproject.org/tor.git/plain/src/config/torrc.sample.in">sample

-    torrc file</a> and the <a

-    href="<page docs/tor-manual>">man

-    page</a> for other Tor options you may want to set.</p>

-

-    <hr>

-    <a id="check"></a>

-    <h2><a class="anchor" href="#check">Make sure your relay is reachable</a></h2>

-    <br>

-

-    <p>If you are using a firewall, open a hole in your firewall

-    so incoming connections can reach the ports you configured

-    (ORPort, plus DirPort if you enabled it). If you have a

-    hardware firewall (Linksys box, cable modem, etc) you might find <a

-    href="http://portforward.com/">portforward.com</a> useful. Also, make sure you

-    allow all <em>outgoing</em> connections too, so your relay can reach the

-    other Tor relays.

-    </p>

-

-    <p>Restart your relay. If it <a

-    href="<page docs/faq>#Logs">logs

-    any warnings</a>, address them.

-    </p>

-

-    <p>As soon as your relay manages to connect to the network, it will

-    try to determine whether the ports you configured are reachable from

-    the outside. This step is usually fast, but may take up to 20

-    minutes. Look for a <a href="<page docs/faq>#Logs">log entry</a> like

-    <pre>Self-testing indicates your ORPort is reachable from the outside. Excellent.</pre>

-    If you don't see this message, it means that your relay is not reachable

-    from the outside — you should re-check your firewalls, check that it's

-    testing the IP and port you think it should be testing, etc.

-    </p>

-

-    <p>When your relay has decided that it's reachable, it will upload a "server

-    descriptor" to the directories, to let clients know

-    what address, ports, keys, etc your relay is using. You can search <a

-    href="https://atlas.torproject.org/">Atlas</a> or <a

-    href="https://globe.torproject.org/">Globe</a> for

-    the nickname you configured, to make sure it's there. You may need to wait

-    up to one hour for the directories to publish the new server information.</p>

-

-    <hr>

-    <a id="after"></a>

-    <h2><a class="anchor" href="#after">Once your relay is working</a></h2>

-    <br>

-

-    <p>To learn more about the proper care and feeding for your relay,

-    see the advice on the <a href=<page docs/tor-relay-debian>#after>Tor

-    relay on Debian/Ubuntu</a> page.

-    </p>

-

-    <hr>

-

-    <p>If you have suggestions for improving this document, please <a

-    href="<page about/contact>">send them to us</a>. Thanks

-    for helping to make the Tor network grow!</p>

+  The Tor Relay documentation moved to the <a href="<wiki>TorRelayGuide">wiki</a>.

   </div>

   <!-- END MAINCOL -->

   <div id = "sidecol">

@@ -55,9 +55,10 @@

     ContactInfo human@...

     </pre>

+# TODO: Update link to PT setup docs

     <p>If you want to be a bridge, read about the BridgeRelay and

     ServerTransportPlugin values <a

-    href="<page projects/obfsproxy-instructions>#instructions">on

+    href="<page docs/pluggable-transports>">on

     this page</a>.</p>

     <p>Tor will use all your bandwidth if you don't set limits for it. Some

@@ -24,7 +24,7 @@

     <p>You can run a Tor relay on pretty much any operating system. Tor relays

     work best on current distributions of Linux, FreeBSD, NetBSD, and

-    Windows Server or later.

+    Windows Server.

     </p>

     <p>

@@ -23,8 +23,8 @@

     </p>

     <p>You can run a Tor relay on pretty much any operating system. Tor relays

-    work best on Linux, OS X Lion or later, FreeBSD 5.x+, NetBSD 5.x+, and

-    Windows Server 2003 or later.

+    work best on current distributions of Linux, FreeBSD, NetBSD, and

+    Windows Server or later.

     </p>

     <p>

@@ -37,15 +37,6 @@

     with those operating systems.

     </p>

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

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

-    in Tor Browser, there are currently no

-    easy relay packages for Windows and 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 (Expert Bundle, Homebrew, Macports). Please help make

-    this process easier!

-    </p>

-

     <hr>

     <a id="torrc"></a>

     <h2><a class="anchor" href="#torrc">Configure Tor by editing the torrc file</a></h2>

@@ -53,10 +44,9 @@

     <p>

     Tor's

-    configuration file is named 'torrc'. In the Tor Browser folder, it's

-    located at</p>

-    <pre>Data\Tor\torrc</pre>

-    <p>Open the file with a text editor and add the following lines:</p>

+    configuration file is named 'torrc'.</p>

+    <p>Locate the file on your system, open it with a text editor and add the

+    following lines:</p>

     <pre>

     ORPort 443

@@ -18,12 +18,12 @@

     <p>

     The Tor network relies on volunteers to donate bandwidth. The more

     people who run relays, the faster the Tor network will be. If you have

-    at least 250 kilobytes/s each way, please help out Tor by configuring your

-    Tor to be a relay too.

+    at least 2 megabits/s for both upload and download, please help out

+    Tor by configuring your Tor to be a relay too.

     </p>

     <p>You can run a Tor relay on pretty much any operating system. Tor relays

-    work best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and

+    work best on Linux, OS X Lion or later, FreeBSD 5.x+, NetBSD 5.x+, and

     Windows Server 2003 or later.

     </p>

@@ -37,20 +37,13 @@

     with those operating systems.

     </p>

-    <p>Windows users can use the Vidalia Bridge Bundle, the Vidalia Relay

-    Bundle and the Vidalia Exit Bundle, which come preconfigured to run

-    Tor as a bridge, a non-exit relay, or an exit relay. Get them from

-    the <a href="<page download/download>">download page</a>, and use

-    the graphical instructions below for help setting them up.

-    </p>

-

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

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

     in Tor Browser, there are currently no

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

+    easy relay packages for Windows and 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

-    easier!

+    your system (Expert Bundle, Homebrew, Macports). Please help make

+    this process easier!

     </p>

     <hr>

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

     <br />

     <p>

-    You can set up a relay without using Vidalia if you wish. Tor's

+    Tor's

     configuration file is named 'torrc'. In the Tor Browser folder, it's

     located at</p>

     <pre>Data\Tor\torrc</pre>

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

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

     options are described in <a href="<page docs/faq>#LimitTotalBandwidth">these</a>

     <a href="<page docs/faq>#BandwidthShaping">FAQ entries</a>.</p>

-    <p>See the <a href="https://gitweb.torproject.org/tor.git/blob_plain/HEAD:/src/config/torrc.sample.in">sample

+    <p>See the <a href="https://gitweb.torproject.org/tor.git/plain/src/config/torrc.sample.in">sample

     torrc file</a> and the <a

     href="<page docs/tor-manual>">man

     page</a> for other Tor options you may want to set.</p>

@@ -53,61 +53,6 @@

     easier!

     </p>

-    <hr>

-    <a id="setup"></a>

-    <h2><a class="anchor" href="#setup">Configure Tor with the Vidalia Graphical Interface</a></h2>

-    <br>

-

-    <p>Please note that this graphical approach is only for

-    Windows users (and very dedicated OS X users): most fast Tor

-    relays are run on Debian or Ubuntu using the <a href="<page

-    docs/tor-relay-debian>">system Tor package</a>, and we encourage

-    you to go that route too.

-    </p>

-

-    <p>

-    Before you start, verify that your clock and timezone are set

-    correctly. If possible, synchronize your clock with public <a

-    href="http://en.wikipedia.org/wiki/Network_Time_Protocol">time

-    servers</a>.

-    </p>

-

-    <ol type=1>

-

-

-<li>Right click on the Vidalia icon in your task bar.  Choose Control Panel.</li><br />

-    	<img alt="Vidalia right click menu" src="$(IMGROOT)/screenshot-win32-vidalia.png" />

-

-    <li>Click "Setup Relaying".</li>

-

-    <li>

-    Choose "Relay Traffic for the Tor network" if you

-want to be a public relay (recommended), or choose "Help

-censored users reach the Tor network" if you want to be a <a

-href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

-    <img alt="Vidalia basic settings" src="$(IMGROOT)/screenshot-win32-configure-relay-1.png" />

-

-    <li>Enter a nickname for your relay, and enter contact information in

-    case we need to contact you about problems.</li>

-

-    <li>Leave "Attempt to automatically configure port forwarding" ticked.

-    Push the "Test" button to see if it works. If it does work, great.

-    If not, see the section on reachability below.</li>

-

-    <li>Choose the "Bandwidth Limits" tab.  Select how much bandwidth you want to provide for Tor users like yourself.</li><br />

-    <img alt="Vidalia bandwidth limits" src="$(IMGROOT)/screenshot-win32-configure-relay-2.png" />

-

-    <li>Select the "Exit Policies" tab.  If you want to allow others

-    to use your relay for these services, don't change anything.  Un-check

-    the services you don't want to allow people to <a href="<page

-    docs/faq>#ExitPolicies">reach from your relay</a>.  If you want to

-    be a non-exit relay, un-check all services.</li><br />

-    <img alt="Vidalia exit policies" src="$(IMGROOT)/screenshot-win32-configure-relay-3.png" />

-

-    <li>Click "Ok".</li>

-

-    </ol>

-

     <hr>

     <a id="torrc"></a>

     <h2><a class="anchor" href="#torrc">Configure Tor by editing the torrc file</a></h2>

@@ -47,11 +47,10 @@

     <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

-    easy relay packages for OS X users. One option is to run

-    Debian in a VM; another option is to install TBB and then a

-    standalone Vidalia bundle on top of it; and a third option is to <a

-    href="https://lists.torproject.org/pipermail/tor-relays/2014-June/004650.html">use

-    Homebrew</a>. Please help make this process easier!

+    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

+    easier!

     </p>

     <hr>

@@ -18,7 +18,7 @@

     <p>

     The Tor network relies on volunteers to donate bandwidth. The more

     people who run relays, the faster the Tor network will be. If you have

-    at least 100 kilobytes/s each way, please help out Tor by configuring your

+    at least 250 kilobytes/s each way, please help out Tor by configuring your

     Tor to be a relay too.

     </p>

@@ -184,55 +184,16 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     <h2><a class="anchor" href="#after">Once your relay is working</a></h2>

     <br>

-    <p>Subscribe to the <a

-    href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce</a>

-    mailing list. It is very low volume, and it will keep you informed

-    of new stable releases.</p>

-

-    <p>As a relay operator, you should consider subscribing to the

-    <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">

-    tor-relays mailing list</a>. You might find <a

-    href="<page docs/documentation>#MailingLists">other higher-volume

-    Tor lists</a> of interest to you as well.

+    <p>To learn more about the proper care and feeding for your relay,

+    see the advice on the <a href=<page docs/tor-relay-debian>#after>Tor

+    relay on Debian/Ubuntu</a> page.

     </p>

-    <p><a href="https://weather.torproject.org/">Tor Weather</a> provides

-    an email notification service to any users who want to monitor the

-    status of a Tor node. Upon subscribing, you can specify what types of

-    alerts you would like to receive. The main purpose of Tor Weather is

-    to notify node operators via email if their node is down for longer

-    than a specified period, but other notification types are available.

-    </p>

-

-    <p>Read

-    <a href="<wiki>doc/OperationalSecurity">about operational security</a>

-    to get ideas how you can increase the security of your relay.

-    </p>

-

-    <p>

-    If you control the name servers for your domain, consider setting your

-    reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when

-    other people see the address in their web logs, they will more quickly

-    understand what's going on. Adding the <a

-    href="<gitblob>contrib/operator-tools/tor-exit-notice.html">Tor

-    exit notice</a> on a vhost for this name can go a long way to deterring abuse

-    complaints to you and your ISP if you are running an exit node.

-    </p>

-

-    <p>

-    When you change your Tor configuration, remember to verify that your

-    relay still works correctly after the change.

-    If you have problems or questions, see

-    the <a href="<page docs/documentation>#Support">Support</a> section or

-    <a href="<page about/contact>">contact us</a>. Thanks

-    for helping to make the Tor network grow!

-    </p>

-

-

     <hr>

     <p>If you have suggestions for improving this document, please <a

-    href="<page about/contact>">send them to us</a>. Thanks!</p>

+    href="<page about/contact>">send them to us</a>. Thanks

+    for helping to make the Tor network grow!</p>

   </div>

   <!-- END MAINCOL -->

   <div id = "sidecol">

@@ -30,7 +30,7 @@

     <p>

     The best approach for most users is to <a href="<page

     docs/tor-relay-debian>">run your relay on Debian or Ubuntu</a> using

-    the system Tor package &mdash the deb takes care of running Tor as a

+    the system Tor package — the deb takes care of running Tor as a

     separate user, making sure it has enough file descriptors available,

     starting it at boot, and so on. Tor relays also run nicely on other

     Linux flavors, and on FreeBSD and NetBSD for those who are comfortable

@@ -54,6 +54,18 @@

     Homebrew</a>. Please help make this process easier!

     </p>

+    <hr>

+    <a id="setup"></a>

+    <h2><a class="anchor" href="#setup">Configure Tor with the Vidalia Graphical Interface</a></h2>

+    <br>

+

+    <p>Please note that this graphical approach is only for

+    Windows users (and very dedicated OS X users): most fast Tor

+    relays are run on Debian or Ubuntu using the <a href="<page

+    docs/tor-relay-debian>">system Tor package</a>, and we encourage

+    you to go that route too.

+    </p>

+

     <p>

     Before you start, verify that your clock and timezone are set

     correctly. If possible, synchronize your clock with public <a

@@ -61,10 +73,6 @@

     servers</a>.

     </p>

-    <hr>

-    <a id="setup"></a>

-    <h2><a class="anchor" href="#setup">Configure Tor with the Vidalia Graphical Interface</a></h2>

-    <br>

     <ol type=1>

@@ -129,7 +129,7 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     options are described in <a href="<page docs/faq>#LimitTotalBandwidth">these</a>

     <a href="<page docs/faq>#BandwidthShaping">FAQ entries</a>.</p>

-    <p>See the <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/src/config/torrc.sample.in">sample

+    <p>See the <a href="https://gitweb.torproject.org/tor.git/blob_plain/HEAD:/src/config/torrc.sample.in">sample

     torrc file</a> and the <a

     href="<page docs/tor-manual>">man

     page</a> for other Tor options you may want to set.</p>

@@ -28,36 +28,38 @@

     </p>

     <p>

-    An easy way to get started is with Vidalia, a graphical interface for

-    Tor. Vidalia is not included in the standard Tor Browser Bundle, although it

-    <a href="<page docs/faq>#WhereDidVidaliaGo">once was</a>.

-    <p>

+    The best approach for most users is to <a href="<page

+    docs/tor-relay-debian>">run your relay on Debian or Ubuntu</a> using

+    the system Tor package &mdash the deb takes care of running Tor as a

+    separate user, making sure it has enough file descriptors available,

+    starting it at boot, and so on. Tor relays also run nicely on other

+    Linux flavors, and on FreeBSD and NetBSD for those who are comfortable

+    with those operating systems.

+    </p>

-    <p>The Vidalia Bridge Bundle, the Vidalia Relay Bundle

-    and the Vidalia Exit Bundle are available on the

-    <a href="<page download/download>">download

-    page</a>. These bundles are only available for Windows. They come

-    preconfigured to run Tor as a bridge, a non-exit relay, or an exit relay.

+    <p>Windows users can use the Vidalia Bridge Bundle, the Vidalia Relay

+    Bundle and the Vidalia Exit Bundle, which come preconfigured to run

+    Tor as a bridge, a non-exit relay, or an exit relay. Get them from

+    the <a href="<page download/download>">download page</a>, and use

+    the graphical instructions below for help setting them up.

     </p>

-    <p>

-    Vidalia is also available as a standalone package from <a

-    href="https://people.torproject.org/~erinn/vidalia-standalone-bundles/">this

-    directory</a>. To use the Vidalia standalone, you will first need to <a

-    href="<page projects/torbrowser>">download the Tor Browser Bundle</a>

-    or the <a href="<page download/download>">Tor Expert Bundle</a>.

-    Unpack the Vidalia package into your Tor Browser folder. This will allow

-    Vidalia to control and configure the Tor Browser Bundle's Tor client. If

-    you use the Expert Bundle, which contains Tor only and no browser, you'll

-    need to inform Vidalia of your Tor's location.

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

+    easy relay packages for OS X users. One option is to run

+    Debian in a VM; another option is to install TBB and then a

+    standalone Vidalia bundle on top of it; and a third option is to <a

+    href="https://lists.torproject.org/pipermail/tor-relays/2014-June/004650.html">use

+    Homebrew</a>. Please help make this process easier!

     </p>

     <p>

-    Make sure your Tor works by using Tor as a client (surf with the Tor

-    Browser, for example). Verify that your clock and timezone are set

+    Before you start, verify that your clock and timezone are set

     correctly. If possible, synchronize your clock with public <a

     href="http://en.wikipedia.org/wiki/Network_Time_Protocol">time

-    servers</a>.</p>

+    servers</a>.

+    </p>

     <hr>

     <a id="setup"></a>

@@ -18,7 +18,7 @@

     <p>

     The Tor network relies on volunteers to donate bandwidth. The more

     people who run relays, the faster the Tor network will be. If you have

-    at least 50 kilobytes/s each way, please help out Tor by configuring your

+    at least 100 kilobytes/s each way, please help out Tor by configuring your

     Tor to be a relay too.

     </p>

@@ -204,7 +204,7 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when

     other people see the address in their web logs, they will more quickly

     understand what's going on. Adding the <a

-    href="<gitblob>contrib/tor-exit-notice.html">Tor

+    href="<gitblob>contrib/operator-tools/tor-exit-notice.html">Tor

     exit notice</a> on a vhost for this name can go a long way to deterring abuse

     complaints to you and your ISP if you are running an exit node.

     </p>

@@ -30,13 +30,12 @@

     <p>

     An easy way to get started is with Vidalia, a graphical interface for

     Tor. Vidalia is not included in the standard Tor Browser Bundle, although it

-    <a href="https://www.torproject.org/docs/faq.html.en#WhereDidVidaliaGo">once

-    was</a>.

+    <a href="<page docs/faq>#WhereDidVidaliaGo">once was</a>.

     <p>

     <p>The Vidalia Bridge Bundle, the Vidalia Relay Bundle

     and the Vidalia Exit Bundle are available on the

-    <a href="https://www.torproject.org/download/download.html.en">download

+    <a href="<page download/download>">download

     page</a>. These bundles are only available for Windows. They come

     preconfigured to run Tor as a bridge, a non-exit relay, or an exit relay.

     </p>

@@ -45,8 +44,8 @@

     Vidalia is also available as a standalone package from <a

     href="https://people.torproject.org/~erinn/vidalia-standalone-bundles/">this

     directory</a>. To use the Vidalia standalone, you will first need to <a

-    href="https://torproject.org/projects/torbrowser.html.en">download

-    the Tor Browser Bundle</a> or the <a href="https://www.torproject.org/download/download.html.en">Tor Expert Bundle</a>.

+    href="<page projects/torbrowser>">download the Tor Browser Bundle</a>

+    or the <a href="<page download/download>">Tor Expert Bundle</a>.

     Unpack the Vidalia package into your Tor Browser folder. This will allow

     Vidalia to control and configure the Tor Browser Bundle's Tor client. If

     you use the Expert Bundle, which contains Tor only and no browser, you'll

@@ -121,7 +120,7 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     <p>If you want to be a bridge, read about the BridgeRelay and

     ServerTransportPlugin values <a

-    href="https://www.torproject.org/projects/obfsproxy-instructions.html.en#instructions">on

+    href="<page projects/obfsproxy-instructions>#instructions">on

     this page</a>.</p>

     <p>Tor will use all your bandwidth if you don't set limits for it. Some

@@ -130,7 +129,7 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     <p>See the <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/src/config/torrc.sample.in">sample

     torrc file</a> and the <a

-    href="https://www.torproject.org/docs/tor-manual.html.en">man

+    href="<page docs/tor-manual>">man

     page</a> for other Tor options you may want to set.</p>

     <hr>

@@ -183,7 +182,7 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     <p>As a relay operator, you should consider subscribing to the

     <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">

     tor-relays mailing list</a>. You might find <a

-    href="../docs/documentation.html.en#MailingLists">other higher-volume

+    href="<page docs/documentation>#MailingLists">other higher-volume

     Tor lists</a> of interest to you as well.

     </p>

@@ -28,33 +28,33 @@

     </p>

     <p>

-    An easy way to get started is with Vidalia, a graphical interface for 

-    Tor. Vidalia is not included in the standard Tor Browser Bundle, although it 

-    <a href="https://www.torproject.org/docs/faq.html.en#WhereDidVidaliaGo">once 

-    was</a>. 

+    An easy way to get started is with Vidalia, a graphical interface for

+    Tor. Vidalia is not included in the standard Tor Browser Bundle, although it

+    <a href="https://www.torproject.org/docs/faq.html.en#WhereDidVidaliaGo">once

+    was</a>.

     <p>

-    <p>The Vidalia Bridge Bundle, the Vidalia Relay Bundle 

-    and the Vidalia Exit Bundle are available on the 

-    <a href="https://www.torproject.org/download/download.html.en">download 

-    page</a>. These bundles are only available for Windows. They come 

-    preconfigured to run Tor as a bridge, a non-exit relay, or an exit relay. 

+    <p>The Vidalia Bridge Bundle, the Vidalia Relay Bundle

+    and the Vidalia Exit Bundle are available on the

+    <a href="https://www.torproject.org/download/download.html.en">download

+    page</a>. These bundles are only available for Windows. They come

+    preconfigured to run Tor as a bridge, a non-exit relay, or an exit relay.

     </p>

     <p>

-    Vidalia is also available as a standalone package from <a 

-    href="https://people.torproject.org/~erinn/vidalia-standalone-bundles/">this 

-    directory</a>. To use the Vidalia standalone, you will first need to <a 

-    href="https://torproject.org/projects/torbrowser.html.en">download 

-    the Tor Browser Bundle</a> or the <a href="https://www.torproject.org/download/download.html.en">Tor Expert Bundle</a>. 

-    Unpack the Vidalia package into your Tor Browser folder. This will allow 

-    Vidalia to control and configure the Tor Browser Bundle's Tor client. If 

-    you use the Expert Bundle, which contains Tor only and no browser, you'll 

+    Vidalia is also available as a standalone package from <a

+    href="https://people.torproject.org/~erinn/vidalia-standalone-bundles/">this

+    directory</a>. To use the Vidalia standalone, you will first need to <a

+    href="https://torproject.org/projects/torbrowser.html.en">download

+    the Tor Browser Bundle</a> or the <a href="https://www.torproject.org/download/download.html.en">Tor Expert Bundle</a>.

+    Unpack the Vidalia package into your Tor Browser folder. This will allow

+    Vidalia to control and configure the Tor Browser Bundle's Tor client. If

+    you use the Expert Bundle, which contains Tor only and no browser, you'll

     need to inform Vidalia of your Tor's location.

     </p>

     <p>

-    Make sure your Tor works by using Tor as a client (surf with the Tor 

+    Make sure your Tor works by using Tor as a client (surf with the Tor

     Browser, for example). Verify that your clock and timezone are set

     correctly. If possible, synchronize your clock with public <a

     href="http://en.wikipedia.org/wiki/Network_Time_Protocol">time

@@ -106,8 +106,8 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     <br />

     <p>

-    You can set up a relay without using Vidalia if you wish. Tor's 

-    configuration file is named 'torrc'. In the Tor Browser folder, it's 

+    You can set up a relay without using Vidalia if you wish. Tor's

+    configuration file is named 'torrc'. In the Tor Browser folder, it's

     located at</p>

     <pre>Data\Tor\torrc</pre>

     <p>Open the file with a text editor and add the following lines:</p>

@@ -119,17 +119,17 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     ContactInfo human@...

     </pre>

-    <p>If you want to be a bridge, read about the BridgeRelay and 

-    ServerTransportPlugin values <a 

+    <p>If you want to be a bridge, read about the BridgeRelay and

+    ServerTransportPlugin values <a

     href="https://www.torproject.org/projects/obfsproxy-instructions.html.en#instructions">on

     this page</a>.</p>

-    <p>Tor will use all your bandwidth if you don't set limits for it. Some 

-    options are described in <a href="<page docs/faq>#LimitTotalBandwidth">these</a> 

+    <p>Tor will use all your bandwidth if you don't set limits for it. Some

+    options are described in <a href="<page docs/faq>#LimitTotalBandwidth">these</a>

     <a href="<page docs/faq>#BandwidthShaping">FAQ entries</a>.</p>

-    <p>See the <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/src/config/torrc.sample.in">sample 

-    torrc file</a> and the <a 

+    <p>See the <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/src/config/torrc.sample.in">sample

+    torrc file</a> and the <a

     href="https://www.torproject.org/docs/tor-manual.html.en">man

     page</a> for other Tor options you may want to set.</p>

@@ -165,9 +165,9 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     <p>When your relay has decided that it's reachable, it will upload a "server

     descriptor" to the directories, to let clients know

     what address, ports, keys, etc your relay is using. You can search <a

-    href="https://atlas.torproject.org/">Atlas</a> or <a 

-    href="https://globe.torproject.org/">Globe</a> for 

-    the nickname you configured, to make sure it's there. You may need to wait 

+    href="https://atlas.torproject.org/">Atlas</a> or <a

+    href="https://globe.torproject.org/">Globe</a> for

+    the nickname you configured, to make sure it's there. You may need to wait

     up to one hour for the directories to publish the new server information.</p>

     <hr>

@@ -179,11 +179,11 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce</a>

     mailing list. It is very low volume, and it will keep you informed

     of new stable releases.</p>

-    

-    <p>As a relay operator, you should consider subscribing to the 

+

+    <p>As a relay operator, you should consider subscribing to the

     <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">

     tor-relays mailing list</a>. You might find <a

-    href="../docs/documentation.html.en#MailingLists">other higher-volume 

+    href="../docs/documentation.html.en#MailingLists">other higher-volume

     Tor lists</a> of interest to you as well.

     </p>

@@ -102,7 +102,7 @@ href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

     <hr>

     <a id="torrc"></a>

-    <h2><a class="anchor" href="#torrc">Configuring Tor by editing the torrc file</a></h2>

+    <h2><a class="anchor" href="#torrc">Configure Tor by editing the torrc file</a></h2>

     <br />

     <p>

@@ -31,21 +31,14 @@

     An easy way to get started is with Vidalia, a graphical interface for 

     Tor. Vidalia is not included in the standard Tor Browser Bundle, although it 

     <a href="https://www.torproject.org/docs/faq.html.en#WhereDidVidaliaGo">once 

-    was</a>. You can use Vidalia as part of the preconfigured bundles, or as a 

-    seperate program. 

+    was</a>. 

     <p>

     <p>The Vidalia Bridge Bundle, the Vidalia Relay Bundle 

-    and the Vidalia Exit Bundle can be found on the 

+    and the Vidalia Exit Bundle are available on the 

     <a href="https://www.torproject.org/download/download.html.en">download 

-    page</a>. These packages are already configured to run Tor as a bridge, a

-    non-exit relay, or an exit relay. These bundles are only available for 

-    Windows.

-    </p>

-

-    <p>

-    If you are not the using the Bridge Bundle, Relay Bundle or Exit Bundle, 

-    you will need to .

+    page</a>. These bundles are only available for Windows. They come 

+    preconfigured to run Tor as a bridge, a non-exit relay, or an exit relay. 

     </p>

     <p>

@@ -55,13 +48,9 @@

     href="https://torproject.org/projects/torbrowser.html.en">download 

     the Tor Browser Bundle</a> or the <a href="https://www.torproject.org/download/download.html.en">Tor Expert Bundle</a>. 

     Unpack the Vidalia package into your Tor Browser folder. This will allow 

-    Vidalia to control and configure the Tor Browser Bundle's Tor client. 

-    </p>

-

-    <p>

-    If you use the Expert Bundle, which contains Tor only and no browser, 

-    you'll need to inform Vidalia of your Tor's location. You can not run

-    Vidalia unless Tor is running.

+    Vidalia to control and configure the Tor Browser Bundle's Tor client. If 

+    you use the Expert Bundle, which contains Tor only and no browser, you'll 

+    need to inform Vidalia of your Tor's location.

     </p>

     <p>

@@ -71,30 +60,6 @@

     href="http://en.wikipedia.org/wiki/Network_Time_Protocol">time

     servers</a>.</p>

-<!--

-    <p>If you're comfortable editing text files, skip this page and

-    go to our dedicated <a href="<page docs/tor-relay-debian>">Relay

-    Configuration Instructions on Debian/Ubuntu</a> page. That page is

-    the best one for relay operators on BSD, Unix, etc as well.</p>

-

-

-    <hr>

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

-    <a id="install"></a>

-    <h2><a class="anchor" href="#install">Step One: Download and Install Tor</a></h2>

-    <br>

-

-    <p>Before you start, you need to make sure that Tor is up and running.

-    </p>

-

-    <p>Visit our <a href="<page download/download>">download page</a> and

-    install the "Installation Bundle" for your OS.

-    </p>

-

-    <p>If it's convenient, you might also want to use it as a client for a

-    while to make sure it's actually working.</p>

-

     <hr>

     <a id="setup"></a>

     <h2><a class="anchor" href="#setup">Configure Tor with the Vidalia Graphical Interface</a></h2>

@@ -102,10 +67,8 @@

     <ol type=1>

-    <li>

-    	Right click on the Vidalia icon in your task bar.  Choose Control Panel.

-    	<img alt="vidalia right click menu" src="$(IMGROOT)/screenshot-win32-vidalia.png" />

-    </li>

+<li>Right click on the Vidalia icon in your task bar.  Choose Control Panel.</li><br />

+    	<img alt="Vidalia right click menu" src="$(IMGROOT)/screenshot-win32-vidalia.png" />

     <li>Click "Setup Relaying".</li>

@@ -113,66 +76,51 @@

     Choose "Relay Traffic for the Tor network" if you

 want to be a public relay (recommended), or choose "Help

 censored users reach the Tor network" if you want to be a <a

-href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.

-    <img alt="vidalia basic settings" src="$(IMGROOT)/screenshot-win32-configure-relay-1.png" />

-    </li>

+href="<page docs/faq>#RelayOrBridge">non-public bridge</a>.</li><br />

+    <img alt="Vidalia basic settings" src="$(IMGROOT)/screenshot-win32-configure-relay-1.png" />

     <li>Enter a nickname for your relay, and enter contact information in

     case we need to contact you about problems.</li>

-    <li>Leave "Attempt to automatically configure port forwarding" clicked.

-    Push the "Test" button to see if it works.  If it does work, great.

-    If not, see number 3 below.</li>

+    <li>Leave "Attempt to automatically configure port forwarding" ticked.

+    Push the "Test" button to see if it works. If it does work, great.

+    If not, see the section on reachability below.</li>

-    <li>Choose the "Bandwidth Limits" tab.  Select how much bandwidth you want to provide for Tor users like yourself.

-    <img alt="vidalia bandwidth limits" src="$(IMGROOT)/screenshot-win32-configure-relay-2.png" />

-    </li>

+    <li>Choose the "Bandwidth Limits" tab.  Select how much bandwidth you want to provide for Tor users like yourself.</li><br />

+    <img alt="Vidalia bandwidth limits" src="$(IMGROOT)/screenshot-win32-configure-relay-2.png" />

     <li>Select the "Exit Policies" tab.  If you want to allow others

     to use your relay for these services, don't change anything.  Un-check

     the services you don't want to allow people to <a href="<page

     docs/faq>#ExitPolicies">reach from your relay</a>.  If you want to

-    be a non-exit relay, un-check all services.

-    <img alt="vidalia exit policies" src="$(IMGROOT)/screenshot-win32-configure-relay-3.png" />

-    </li>

+    be a non-exit relay, un-check all services.</li><br />

+    <img alt="Vidalia exit policies" src="$(IMGROOT)/screenshot-win32-configure-relay-3.png" />

     <li>Click "Ok".</li>

-    <li>If you are using a firewall, open a hole in your firewall

-    so incoming connections can reach the ports you configured

-    (ORPort, plus DirPort if you enabled it). If you have a

-    hardware firewall (Linksys box, cable modem, etc) you might find <a

-    href="http://portforward.com/">portforward.com</a> useful. Also, make sure you

-    allow all <em>outgoing</em> connections too, so your relay can reach the

-    other Tor relays.

-    </li>

-

-    <li>Restart your relay. If it <a

-    href="<page docs/faq>#Logs">logs

-    any warnings</a>, address them.

-    </li>

-

     </ol>