Author: arma Date: 2011-08-22 01:36:47 +0000 (Mon, 22 Aug 2011) New Revision: 24960

Modified: website/trunk/docs/en/bridges.wml website/trunk/docs/en/faq.wml Log: change our "should i be a relay or a bridge" answer, and link to it from the bridge page

Modified: website/trunk/docs/en/bridges.wml =================================================================== --- website/trunk/docs/en/bridges.wml 2011-08-20 20:29:55 UTC (rev 24959) +++ website/trunk/docs/en/bridges.wml 2011-08-22 01:36:47 UTC (rev 24960) @@ -149,11 +149,12 @@ <hr>

<p> - If you want to help out and you can't run a <a href="<page - docs/tor-doc-relay>">normal Tor relay</a>, you should - run a bridge relay. You can configure it either way: + If you want to help out, you should <a href="<page + docs/faq>#RelayOrBridge">decide whether you want to run a normal Tor + relay or a bridge relay</a>. You can configure your bridge either + manually or graphically: <ul> - <li> manually <a href="<page docs/faq>#torrc">edit + <li>manually <a href="<page docs/faq>#torrc">edit your torrc file</a> to be just these four lines:<br> <pre><code> SocksPort 0

Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-08-20 20:29:55 UTC (rev 24959) +++ website/trunk/docs/en/faq.wml 2011-08-22 01:36:47 UTC (rev 24960) @@ -1255,20 +1255,21 @@ publically or not. </p>

- <p>Right now, there are a small number of places in the world that filter - connections to the Tor network. So getting a lot of bridges running - right now is mostly a backup measure, a) in case the Tor network does - get blocked in more places, and b) for people who want an extra layer of - security because they're worried somebody will recognize that it's a - public Tor relay IP address they're contacting. + <p>Right now, China is the main place in the world that filters + connections to the Tor network. So bridges are useful a) for users in + China, b) as a backup measure in case the Tor network gets blocked in + more places, and c) for people who want an extra layer of security + because they're worried somebody will recognize that it's a public + Tor relay IP address they're contacting. </p>

- <p>So should you run a normal relay or bridge relay? If you have - lots of bandwidth, you should definitely run a normal relay &mdash; - bridge relays see very little use these days. If you're willing to - <a href="#ExitPolicies">be an exit</a>, you should definitely run a normal - relay, since we need more exits. If you can't be an exit and only have - a little bit of bandwidth, then flip a coin. Thanks for volunteering! + <p>So should you run a normal relay or bridge relay? If you have lots + of bandwidth, you should definitely run a normal relay &mdash; the + average bridge doesn't see much load these days. If you're willing + to <a href="#ExitPolicies">be an exit</a>, you should definitely + run a normal relay, since we need more exits. If you can't be an + exit and only have a little bit of bandwidth, be a bridge. Thanks + for volunteering! </p>

<hr>