[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r22388: {website} new and updated translations for the website (in website/trunk: bms de docs docs/ar docs/el et fa fi fr it nl no pl ru se zh-cn)



Author: runa
Date: 2010-05-25 18:10:19 +0000 (Tue, 25 May 2010)
New Revision: 22388

Added:
   website/trunk/docs/ar/
   website/trunk/docs/ar/tor-doc-windows.wml
   website/trunk/docs/el/tor-doc-unix.wml
   website/trunk/docs/el/tor-doc-web.wml
Modified:
   website/trunk/bms/faq.wml
   website/trunk/de/bridges.wml
   website/trunk/de/index.wml
   website/trunk/et/bridges.wml
   website/trunk/et/download.wml
   website/trunk/fa/bridges.wml
   website/trunk/fa/download.wml
   website/trunk/fi/download.wml
   website/trunk/fi/index.wml
   website/trunk/fr/bridges.wml
   website/trunk/fr/contact.wml
   website/trunk/fr/documentation.wml
   website/trunk/fr/download.wml
   website/trunk/fr/faq.wml
   website/trunk/fr/hidden-services.wml
   website/trunk/fr/index.wml
   website/trunk/fr/people.wml
   website/trunk/fr/running-a-mirror.wml
   website/trunk/fr/tormedia.wml
   website/trunk/fr/volunteer.wml
   website/trunk/it/index.wml
   website/trunk/nl/download.wml
   website/trunk/nl/index.wml
   website/trunk/no/bridges.wml
   website/trunk/no/documentation.wml
   website/trunk/no/download.wml
   website/trunk/no/index.wml
   website/trunk/pl/download.wml
   website/trunk/pl/faq-abuse.wml
   website/trunk/pl/faq.wml
   website/trunk/pl/index.wml
   website/trunk/pl/research.wml
   website/trunk/pl/running-a-mirror.wml
   website/trunk/pl/tormedia.wml
   website/trunk/pl/volunteer.wml
   website/trunk/ru/bridges.wml
   website/trunk/ru/contact.wml
   website/trunk/ru/documentation.wml
   website/trunk/ru/download.wml
   website/trunk/ru/faq.wml
   website/trunk/ru/hidden-services.wml
   website/trunk/ru/index.wml
   website/trunk/ru/people.wml
   website/trunk/se/index.wml
   website/trunk/zh-cn/bridges.wml
   website/trunk/zh-cn/contact.wml
   website/trunk/zh-cn/download.wml
   website/trunk/zh-cn/index.wml
Log:
new and updated translations for the website

Modified: website/trunk/bms/faq.wml
===================================================================
--- website/trunk/bms/faq.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/bms/faq.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -90,9 +90,9 @@
 ááááááá áááááááááááááááá ?</a></li>
 </ul>
 
-<p>á áááááááááááááááááá áááááááááááá áááááá áááááááááááá áááááááááááááááááááááá
-<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ";>wiki
-FAQ</a> ááá ááááááááááááá</p>
+<p>For other questions not yet on this version of the FAQ, see the <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>wiki
+FAQ</a> for now.</p>
 
 <hr /> <a id="General"></a> <a id="WhatIsTor"></a>
 <h3><a class="anchor" href="#WhatIsTor">Tor ááááá áááá ?</a></h3>
@@ -215,16 +215,15 @@
 </p>
 
 <p>
-Tor ááááá áááááááááááááááá ááááá áááááááááááááááááááááááá áááááááá
-áááááááááááááááááááá ááááááááááááááááááááááááá áááááááááá
-ááááááááááááááááááááááá ááááááááá áááááááááááááááááá ááááááááááá
-ááááááááááááááá ááááááááááááááá ááááááááááááá áááááááá <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>ááááááááááááááááááááááááááá
-Tor áááááááááááááááááá ááááááá</a>áááááááá áááááááááááááááááááááá ááááááááá
-ááááááááááá <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>áááááááááááááááááááááá
-Tor áá áááááááááááááááááá áááááááááááá ááááááááááááááááááááááááá</a>áááá
-ááááááááá áááááááááá áááááááááá ááááááááááááá áááááááááááá áááááááááá
+There are plenty of other programs you can use with Tor, but we haven't
+researched the application-level anonymity issues on them well enough to be
+able to recommend a safe configuration. Our wiki has a list of instructions
+for <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO";>Torifying
+specific applications</a>. There's also a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>list
+of applications that help you direct your traffic through Tor</a>.  Please
+add to these lists and help us keep them accurate!
 </p>
 
 <hr /> <a id="WhyCalledTor"></a>
@@ -465,16 +464,14 @@
 </li>
 
 <li>
-ááááááááááááááááááá áááááá Tor áááááááááááááááááá áááááááááááá áááááááááááá
-ááááááááá <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/FireFoxTorPerf";>áááá
-Firefox ááá Tor ááá ááááááááááááááááááá ááááááááááááááááá áááááááááááááááááá
-áááááááááááááááááá</a> <a
-href="http://www.pps.jussieu.fr/~jch/software/polipo/tor.html";>Polipo ááá
-Tor ááááááááá ááááááááááááááááááá</a> <a href="<page download>">Tor á
-áááááááááááááááááá ááááááááááááááááááá áááááááááááááááááá</a> áááááááááá
-ááááááááá ááááááááááááááááá ááááááááááá ááááááááááááááááá áááááááááááááááá
-áááááááá ááááááááááááááá ááááááááá
+There are some steps that individuals can take to improve their Tor
+performance. <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/FireFoxTorPerf";>You
+can configure your Firefox to handle Tor better</a>, <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/tor.html";>you can use
+Polipo with Tor</a>, or you can try <a href="<page download>">upgrading to
+the latest version of Tor</a>.  If this works well, please help by
+documenting what you did, and letting us know about it.
 </li>
 
 <li>
@@ -790,11 +787,11 @@
 áááááááááááááááá ááááá Tor ááááááááá <a
 href="http://www.northernsecurity.net/download/ele/";>http://www.northernsecurity.net/download/ele/</a>
 áááá download ááááááááááááááá</li>
-<li>Virtual Privacy Machine ááá Linux LiveCD áááááááá Firefox, Privoxy, Tor, IRC
-ááááááááááá IM áááááááááááááááááááá ááááááááááááááá ááááááá Tor áááááááá
-áááááááááááááá    ááááááááááááááá ááááááááá áááááááááá ipchains
-ááááááááááááá ááááááááááá áááááááááááááááááá áááááááááááááááá <a
-href="https://wiki.torproject.org/noreply/VirtualPrivacyMachine";>https://wiki.torproject.org/noreply/VirtualPrivacyMachine</a></li>
+<li>Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy,
+Tor, some IRC and IM applications, and a set of ipchains rules aimed to
+prevent non-Tor traffic from accidentally leaving your computer. More
+information at <a
+href="https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine";>https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine</a>.</li>
 <li>Anonym. OS ááá áááááá CD ááááááááááá LiveCD áááááááá áááááááá Linux ááá
 áááááááááááááááááááááá ááááááááá OpenBSD ááááááááááááá áááá
 áááááááááááááááááá áááááááááááá áááááááá áááááááááááááááá
@@ -886,10 +883,10 @@
 
 <ul>
 <li>Tor has built-in support for <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth";>
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#LimitBandwidth";>
 rate limiting</a>. Further, if you have a fast link but want to limit the
 number of bytes per day (or week or month) that you donate, check out the <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Hibernation";>hibernation
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Hibernation";>hibernation
 feature</a>.
 </li>
 <li>Tor ááááááááááááááááááááááááááááááá á áááááááááááááááá ááááááá ááááááááá
@@ -913,7 +910,7 @@
 <li>If your relay is behind a NAT and it doesn't know its public IP (e.g. it has
 an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP
 connections is system dependent but <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>this
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>this
 FAQ entry</a> offers some examples on how to do this.
 </li>
 <li>ááááááááááááááááááááá áá áááááááááá áááááááááááááááááá áááááááááááá
@@ -948,21 +945,17 @@
 </p>
 
 <p>
-ááááááá ááááááááááááá ááááááááááá áááááááááááááááááááá
-ááááááááááááááááááááá(áááá - web áááááááááááá) áááááááá
-ááááááááááááááááááááááááááá(áááá - ááááá)á Tor áá áááááááááááááááááá
-ááá(áááá - ááááááá ááááááááááááááá portáááá)ááááááá ááááááááá <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#DefaultPorts";>áááááááááááááááá</a>
-áááá ááááááááááááá Vidalia á "áááááááááá" tab áááá áááááááááááááááááá
-ááááááááá áááá <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>torrc</a>
-áááááááá áááááááááááááááááááááááááááá
-áááááááááááááááááááááááááááááááááááááááá ááááááááááááááá ááááááááááááááááá
-"reject *.*" áá ááááááááá(ááááááááá Vidalia áá
-áááááááááááááááááááááááááááááá áááááááááááááááááááááááá)áá ááááááááááááá
-áááááááááááá áááá ááááááááááááááááá Tor ááááááááááááá ááááááááááááááááá
-ááááááááááááááá áááááááááááááá áááááááá ááááá website áááá ááááááááá ááááá
-ááááááááááááááááááá ááááááááááááááááááá ááááááááááááá áááááááááááá
+The default exit policy allows access to many popular services (e.g. web
+browsing), but <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#DefaultPorts";>restricts</a>
+some due to abuse potential (e.g. mail) and some since the Tor network can't
+handle the load (e.g. default file-sharing ports). You can change your exit
+policy using Vidalia's "Sharing" tab, or by manually editing your <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#torrc";>torrc</a>
+file. If you want to avoid most if not all abuse potential, set it to
+"reject *:*" (or un-check all the boxes in Vidalia). This setting means that
+your relay will be used for relaying traffic inside the Tor network, but not
+for connections to external websites or other services.
 </p>
 
 <p>
@@ -1038,7 +1031,7 @@
 <li>If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is
 probably forking separate processes rather than using threads. Consider
 switching to a <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayOS";>better
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayOS";>better
 operating system</a>.</li>
 
 <li>If you still can't handle the memory load, consider reducing the amount of
@@ -1147,21 +1140,16 @@
 ááááááááááááááááááááááááá ááá áááááááááááááááá</a></h3>
 
 <p>
-Tor ááááááááááááááááá ááááááááááááááááááááááááááááááá ááááááááááááá
-áááááááááááááááááááááááá ááááááááááááááááá áááááááááá ááááááááááá
-ááááááááááááááá ááááááááááááááááá <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>Tor
-áááááááááááááá ááááááááááááááá áááá ááááááááááááá ááááááááááááá</a>
-ááááááááááááááá Tor áááááááááááááááááá ááááááááááááá áááááááááááááááááá
-ááááááááááááááá áááá - áááááá Tor client ááááááá ááááááááááááááááááááááá
-firewall ááááááááááá áááááááááááááááá áááááááá ááááááá ááááááááááááá
-ááááááááá ááááááááááááááááá áááááááááááááááááááá áááááááá
-áááááááááááááááááááááá áááááááá ááá client ááááááá ááááááááááááááááááááá
-ááááááááááááá áááááááááááááááááááááá áááááááááááá áááááááááááá
-áááááááááááááááááááááá áááááááááááááááááá Tor ááááááááááááááááááááááá
-áááááááá ááááááá ááááááááá áááááááá áááááááá áááááááááááááááááááá
-ááááááááááááááá á client ááááááá áááááááááááááááá ááááááá
-áááááááááááááááááááááá áááááááááá
+Requiring every Tor user to be a relay would help with scaling the network
+to handle all our users, and <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>running
+a Tor relay may help your anonymity</a>. However, many Tor users cannot be
+good relays &mdash; for example, some Tor clients operate from behind
+restrictive firewalls, connect via modem, or otherwise aren't in a position
+where they can relay traffic. Providing service to these clients is a
+critical part of providing effective anonymity for everyone, since many Tor
+users are subject to these or similar constraints and including these
+clients increases the size of the anonymity set.
 </p>
 
 <p>
@@ -1189,16 +1177,14 @@
 </p>
 
 <p>
-áááááááá áááááááááá áááááááááááááá áááááááááááááááá ááááááááááá
-ááááááááááááááááá ááááááááááááááááááá ááááááááááááááá áááááááááááá
-ááááááááááááááááá <a href="<page volunteer>#Research">ááááááááááááááááá
-áááááá áá ááááááááááá item #7</a> ááá áááááááá "Tor ááá áááááááááááá
-ááááááááááááááá ááááááááááááá ááááááááááááááááá(áááá ááááááá ááááááááá DSL)á
-ááááááááá <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#TransportIPnotTCP";>UDP
-ááááááááááááááá áááááááááááááá</a>ááá áááááááááááááá áááá
-áááááááááááááááááááááá ááááááááááááááááá alas ááá ááááááááááááááááá áááá
-ááááááááááááááá áááááááááá
+Second, we still need to get better at automatically estimating the right
+amount of bandwidth to allow. See item #7 on the <a href="<page
+volunteer>#Research">research section of the volunteer page</a>: "Tor
+doesn't work very well when relays have asymmetric bandwidth (e.g. cable or
+DSL)". It might be that <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#TransportIPnotTCP";>switching
+to UDP transport</a> is the simplest answer here &mdash; which alas is not a
+very simple answer at all.
 </p>
 
 <p>
@@ -1257,9 +1243,9 @@
 áááááááááááááááááááááááá ááááá ááááááá áááááááááááááááá ?</a></h3>
 
 <p>
-ISP áááá áááááááááááá ááááááááááá ááááááááááááááááá <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";>ááááááááá
-ááááááááááááááááá</a>
+A collection of templates for successfully responding to ISPs is <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorAbuseTemplates";>collected
+here</a>.
 </p>
 
 <hr />

Modified: website/trunk/de/bridges.wml
===================================================================
--- website/trunk/de/bridges.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/de/bridges.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -35,17 +35,16 @@
 </p>
 
 <p>
-Es kann auch sein, dass Tor aus anderen GrÃnden nicht funktioniert. Die
-neueste Version des <a href="<page torbrowser/index>">Tor-Browser-Pakets</a>
-auf Windows versucht Ihnen bessere Hinweise auf Verbindungsprobleme zu
-geben. Ebenfalls sollten Sie die <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>FAQ
-Ãber Probleme mit Tor</a> lesen, falls UnregelmÃssigkeiten auftauchen. Wenn
-Sie dass GefÃhl haben, dass dieses Problem eindeutig blockiert oder falls
-Sie es einfach einmal ausprobieren mÃchten, weil Sie unsicher sind oder
-abenteuerlustig, dann lesen Sie weiter. Stellen Sie sicher dass Sie das <a
-href="<page download>#Dev">neueste Paket 0.2.1.x oder 0.2.2.x fÃr Ihre
-Plattform haben</a>.
+Note that it's also possible that Tor is non-functional for other
+reasons. The latest version of <a href="<page torbrowser/index>">The Tor
+Browser Bundle</a> on Windows tries to give you better hints about why Tor
+is having problems connecting. You should also read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>the
+FAQ about problems with running Tor properly</a> when you have issues.  If
+you feel that the issue is clearly blocking, or you'd simply like to try
+because you're unsure or feeling adventurous, please read on. Ensure that
+you're using the <a href="<page download>#Dev">latest 0.2.1.x or 0.2.2.x
+bundle for your platform</a>.
 </p>
 
 <p>
@@ -159,10 +158,9 @@
 Sie einen BrÃcken-Server betreiben. Sie kÃnnen diesen auf folgende Arten
 konfigurieren:
 <ul>
-<li> <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>Ãndern
-Sie von Hand die torrc Datei</a> indem Sie lediglich diese vier Zeilen
-einfÃgen:<br />
+<li> manually <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>edit
+your torrc file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -175,11 +173,10 @@
 </ul>
 </p>
 
-<p>Wenn Sie beim Starten von Tor Fehlermeldungen wie  "Could not bind to
-0.0.0.0:443: Permission denied" erhalten, mÃssen Sie einen anderen Port
-(z.B. 8080) als ORPort angeben oder <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>Port-Forwarding
-einrichten</a>.
+<p>If you get "Could not bind to 0.0.0.0:443: Permission denied" errors on
+startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>some
+complex port forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/de/index.wml
===================================================================
--- website/trunk/de/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/de/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -64,16 +64,14 @@
 download>#Warning">was Tor fÃr dich macht und was es nicht macht</a>.</p>
 
 <p>
-Die Sicherheit von Tor verbessert sich, je mehr die Nutzerbasis wÃchst und
-je mehr Freiwillige bereit sind, <a href="<page docs/tor-doc-relay>">Server
-zu betreiben</a>. (Es ist gar nicht so schwer einen einzurichten und fÃr
-einige <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>Angriffe
-kannst du deine eigene AnonymitÃt dadurch noch weiter erhÃhen</a>.) Falls du
-keinen Server betreiben willst, kÃnnen wir auch <a href="<page
-volunteer>">Hilfe bei anderen Aspekten des Projektes</a>
-gebrauchen. AuÃerdem benÃtigen wir Geld, um das Netzwerk schneller und
-leichter benutzbar zu machen.</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor ist eine nach 501(c)(3) registrierte Non-Profit-Organisation (US-Recht),
 deren Aufgabe es ist, deinen Internetverkehr vor Analysen zu schÃtzen. Bitte

Added: website/trunk/docs/ar/tor-doc-windows.wml
===================================================================
--- website/trunk/docs/ar/tor-doc-windows.wml	                        (rev 0)
+++ website/trunk/docs/ar/tor-doc-windows.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 1-high
+#include "head.wmi" TITLE="Tor: MS Windows Install Instructions" CHARSET="UTF-8"
+<div class="center">
+
+<div class="main-column">
+
+<h1>ØØØÙÙ ÙÙÙÙ <a href="<page index>">ØÙØ</a> ØÙÙ ÙÙÙØÙØ ÙÙ ÙØÙÙØÙØÙÙØ.</h1>
+<br />
+
+<p>
+<br />ÙØØØ ØÙ ÙØÙ ØÙØØÙÙÙØØ ØØØØ ØØØØÙÙ ÙÙÙÙ ØÙØ ØÙÙ ØØØØØØØ ÙÙÙØÙØ ØÙØØÙÙØ:
+(2000Ø XPØ VistaØ 7Ø Server).  ØÙ ÙÙØ ØØÙØ ØØÙÙÙ ØÙØØØØÙ ÙÙØØØØÙÙÙ ØØØÙÙ
+ÙÙØØØØØ ØÙØØÙØ ØÙÙ ØÙÙÙÙ (ÙØØÙ ØÙ ØÙØÙ ØÙÙ)Ø ÙÙÙÙÙ ÙØØØØ ØÙÙÙ <a href="<page
+docs/tor-doc-relay>">ØØØ ØØØØØØØ ØÙØØÙÙÙØ</a>.</b>
+</p>
+
+<p>ÙØÙ Freedom House ØØØØØØ ÙÙØÙÙ ØÙÙ ÙÙÙÙØ ØÙØÙØ ØÙØ.  ÙÙÙÙÙ ØÙ ØØØÙ ØÙÙ <a
+href="http://media.torproject.org/video/2009-install-and-use-tor.ogv";>ÙÙÙ
+ÙÙÙÙÙ ØÙ ØÙØØ ØÙØ ÙÙ ÙÙÙØÙØ</a>.  ØÙ ÙÙØ ØØØÙ ØÙØÙØ ÙÙØÙÙ ØÙØÙ ØÙ ÙÙØÙÙ ØÙØ
+ØØØÙØÙ ØÙÙ ÙØØÙ ÙØØÙ ØÙ ØÙÙÙ ØØØØØØÙØ!</p>
+
+<div class="center">
+<p><video id="v1" src="http://media.torproject.org/video/2009-install-and-use-tor.ogv"; autobuffer="true" controls="controls"></video></p>
+</div>
+
+<hr /> <a id="installing"></a>
+<h2><a class="anchor" href="#installing">ØÙØØÙØ ØÙØÙÙÙ: ØÙÙ ÙÙØÙØ ØÙØ</a></h2>
+<br />
+
+<p>
+ØÙØØÙ ØÙØØØØ ØÙÙÙØÙØ ØØØÙÙ ØÙÙ <a href="<page index>ØÙØ</a> Ù<a href="<page
+vidalia/index>">ÙÙØØÙÙØ</a> (ÙØØÙØ ØØØØØØÙ ØØÙÙÙØ ÙØÙØ) Ù<a
+href="https://addons.mozilla.org/firefox/2275/";>ÙÙØØØ ØÙØ Torbutton</a>
+(ØØØÙØ ØØØØ ØÙØØÙØ ÙØÙØÙÙÙØ) ÙPolipo<a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/";> </a>(ØØÙÙØÙ ØÙØØÙØ)
+ÙØØÙ ÙØÙÙØÙÙ ÙÙ ØØÙØ ÙØØØØØ ØØØÙÙ ØØØØØ ØØØÙÙØØ ÙØØÙØØ ØØÙÙ ÙØØÙØ ÙØØÙÙ
+ØÙÙØÙ.  ÙÙÙÙ ØÙ ØØÙÙ ØÙÙØØØ <a
+href="../<package-win32-bundle-stable>">ØÙÙØØÙØØ</a> ØÙ ØÙÙØØØ <a
+href="../<package-win32-bundle-alpha>">ØÙØØØÙØÙØ</a> ÙÙ ØØÙØ ÙÙÙØÙØØ ØÙ ØØØØ
+ØÙ ØÙÙØÙØ ÙÙ ØÙØÙØØØØ ØÙÙ <a href="<page download>">ØÙØØ ØÙØØÙÙÙ</a>.
+</p>
+
+<img alt="ØÙØØ ØØØÙØ ØÙØÙØ ØØÙØÙØ ØÙØ"
+src="../img/screenshot-win32-installer-splash.png" />
+
+<p>ØÙ ÙÙØ ÙØ ÙØØØ ØÙØ ØÙ ÙÙØØÙÙØ (Vidalia) ØÙ Polipo ØØÙÙ ÙØØÙ ÙÙÙÙÙ ØÙ ØÙØÙ
+ØØØÙØØ ØÙÙÙÙÙØØ ØÙØÙ ÙØ ØØØØØ ÙØÙØÙØÙØ ÙØØØØÙ ÙÙ ÙØØØ ØÙØÙØØ ØÙØØÙØ ØØÙØÙ.
+</p>
+
+<img alt="ØØØØ ØÙÙÙÙÙØØ ØÙØÙ ØØÙØ ØÙØÙØÙØ"
+src="../img/screenshot-win32-installer-components.png" />
+
+<p>ØØØ ØÙ ØÙØÙÙ ÙÙ ØÙØÙØÙØØ ØÙØÙ ØØØÙÙ ØÙÙÙÙÙØØ ØÙØÙ ØØØØØÙØ ØØÙÙ ØÙØÙÙØØÙÙÙ.
+</p>
+
+<p>ÙØØÙ ØÙØ ÙØØÙØØÙ ØÙÙ ØÙ ÙØØØØÙ ÙÙÙÙÙ ØØÙÙ ØÙØØØØÙ. ÙÙÙ ÙØØØØÙ ÙÙÙ ØØØØØØØ
+ØÙØØØØÙØ ÙØÙØØ ÙØØÙØ ØÙØØØØØ ÙÙ ÙØØØØÙØ ÙØØÙÙØ ØÙ ÙÙ ØÙØØØØØØØ. ØÙØÙÙ ØÙØÙ
+ØÙØÙØ ØÙØ.
+</p>
+
+<hr /> <a id="using"></a>
+<h2><a class="anchor" href="#using">ØÙØØÙØ ØÙØØÙÙØ: ØØØ ØÙØØØÙØ ØØÙØ ØØØØØÙ
+ØÙØ</a></h2>
+<br />
+
+<p>ØØØ ØÙØÙØ ØÙØ ÙPolipoØ ØØØØØØ ÙØÙ ØØØØ ØØØØØØØ ØØØÙØÙ ÙØØÙÙÙ ÙÙ ØØØØØØÙÙØ ÙØ
+ØÙØ. ØÙÙ ØØÙØ ÙÙ ØØØ ØÙÙØØÙØ.</p>
+
+<p>ÙØØ ØÙ ØØØØØÙ ØÙØ ÙØ ÙØÙØÙÙÙØ ÙÙÙØØØ ØÙØ (Torbutton)Ø ÙØØÙÙ ØØØØ ÙÙ
+ØÙØÙØÙ. ØÙØØÙØ ØÙÙÙ ØØÙØÙØ ØØØÙØ <a
+href="https://addons.mozilla.org/firefox/2275/";>Torbutton</a> ØÙÙ ØÙØØÙ. ØØØ
+ØØØÙÙ ÙØÙØÙÙÙØ ÙØÙØÙÙ ØÙØÙØ.
+</p>
+
+<img alt="ØØØÙØ Torbutton ÙÙØØÙØ ÙØÙØÙÙÙØ"
+src="../img/screenshot-torbutton.png" border="1"/> <br />
+
+<p>
+ØØØ ÙÙØ ØØÙØ ØÙ ØØØØØÙ ÙØÙØÙÙÙØ ØÙÙ ØØØØ ÙÙÙØÙ ØÙ ØÙØØ ÙÙÙÙÙ ØÙØÙØØ ØÙÙ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress";>ØÙØØØÙØ
+ØÙØØØØØ ØÙÙ ØØØÙÙ ØÙØ ØÙÙ ÙÙØÙÙØØ ÙÙÙØÙ</a>.
+</p>
+
+<p>To Torify other applications that support HTTP proxies, just 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
+FAQ entry</a> for why this may be dangerous. For applications that support
+neither SOCKS nor HTTP, take a look at SocksCap or <a
+href="http://www.freecap.ru/eng/";>FreeCap</a>.  (FreeCap is free software;
+SocksCap is proprietary.)</p>
+
+<p>ÙÙØÙÙÙØØ ØÙÙ ÙÙÙ ØÙØÙ ØØØØØØÙ ØÙØ ÙÙ ØÙØØØÙÙØØ ØÙØØØÙØ ÙØØÙ ÙØØØØØ ØÙÙÙ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>ØÙØÙÙ
+ØÙØ ÙÙ ØÙØØØÙÙØØ ØÙÙØØÙÙØ</a>.
+</p>
+
+<hr /> <a id="verify"></a>
+<h2><a class="anchor" href="#verify">ØÙØØÙØ ØÙØØÙØØ: ØØÙØ ÙÙ ØÙÙ ÙØÙÙ</a></h2>
+<br />
+
+<p>
+ØØÙÙ ÙÙØ ØØØ ÙØÙ ÙÙØØÙÙØ ÙØØÙØÙ.  ÙÙØØÙÙØ ÙØØØØÙ ØØÙ ØØÙØ ØØØØØ ØØÙØØ
+ÙÙØØØØØ ØÙÙ ÙÙØÙØ ÙØØÙØ ØØÙÙØ ØÙÙÙØ ØØØØØ Ã ØØÙÙÙÙ ØÙØØÙØ ØÙØÙØ ÙÙÙÙ ØÙØ ØÙØ
+ÙÙØÙ. ÙÙÙÙ ØØØ ØØØÙÙ ØÙ ØÙÙØÙ ØÙØ ØØÙÙÙØ ØÙÙÙÙÙÙ ØÙÙ ØÙÙÙÙØ ØÙØ ÙÙ ØØÙØ
+ØÙÙÙØÙ ÙØØØÙØØ "ØØØ" ØÙ "ØÙÙØÙ" ÙÙ ØÙÙØØÙØ ÙÙØ ÙØÙØ ØØÙØÙ:
+</p>
+
+<img alt="Vidalia Tray Icon" src="../img/screenshot-win32-vidalia.png"/>
+
+<p>
+Next, you should try using your browser with Tor and make sure that your IP
+address is being anonymized. Click on <a
+href="https://check.torproject.org/";>the Tor detector</a> and see whether it
+thinks you're using Tor or not.  (If that site is down, see <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate";>this
+FAQ entry</a> for more suggestions on how to test your Tor.)
+</p>
+
+<p>If you have a personal firewall that limits your computer's ability to
+connect to itself, be sure to allow connections from your local applications
+to local port 8118 and port 9050. If your firewall blocks outgoing
+connections, punch a hole so it can connect to at least TCP ports 80 and
+443, and then see <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient";>this
+FAQ entry</a>.
+</p>
+
+<p>If it's still not working, look at <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>this
+FAQ entry</a> for hints.</p>
+
+<p>
+Once it's working, learn more about <a href="<page download>#Warning">what
+Tor does and does not offer</a>.
+</p>
+
+<hr /> <a id="server"></a>  <a id="relay"></a>
+<h2><a class="anchor" href="#relay">ØÙØØÙØ ØÙØØØØØ: ØØØ ØØØØØØØ ØÙØØÙÙÙØ</a></h2>
+<br />
+
+<p>ØØÙØ ØÙØ ØØØÙØ ØÙÙ ØÙÙØØÙØÙÙ ØÙØÙÙ ÙØØØØÙÙ ØØØØ ØÙØØÙØ. ÙÙÙØ ØØØØØ ØØØ
+ØÙØØØØØ ØÙØÙÙ ÙØØÙÙÙ ØØÙÙÙØØØ ÙÙÙØ ØØØØØØ ØØØØ ØØÙØ ØÙØ. ØØØ ÙØÙØ ÙØÙÙ ØØØØÙ
+ØØØØØ 20 ÙÙÙÙ ØØÙØ - ÙÙ ØÙØØØØÙÙÙ - ØÙÙ ØÙØÙÙØ ÙØØÙ ØÙ ØØØØØ ØÙØ ØØØØ ØÙØ
+ØÙÙ ØÙ ÙØÙÙ ÙØØÙÙÙØ ØÙØØÙ. ÙØÙÙØ ØÙØØÙØ ÙÙ ØÙÙØØÙØ ØÙØÙ ØØØÙ ØØÙÙÙØØ ØÙØ
+ØÙÙØ ÙØÙØ ÙØØØØØ ÙØØÙÙØ ÙØØ ØØ ØÙØÙ ÙØØØØØØÙ ØØØ ØÙØØÙØØ ÙØÙØØØØ ØÙØØÙØ ØØÙ
+ØØØØÙØ ØÙØØ ÙÙ ØÙØØØØ ÙØÙØÙÙ ØÙØ ØÙØØØØØØÙØ ÙØØÙ ØÙØÙÙÙ IP ØÙØÙÙØÙÙÙÙØ.</p>
+
+<p>ÙØÙØ ØÙØØÙØ ÙÙ ØÙØØÙÙÙØØ ÙÙ ÙÙØØÙ ÙØØÙÙØ ÙÙ ÙØ ÙØØÙ ÙØØØØÙÙ ØÙØ ØÙÙÙÙ. <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>ÙÙÙÙÙ
+ØÙ ØØØÙ ØÙÙ ØØÙ ØÙØØ ÙÙØÙÙÙÙØ ÙÙÙØÙ</a>Ø ØÙØ ØÙ ØÙÙÙØÙØ ØÙØØÙØØ ÙØ ÙÙÙÙØ ØÙ
+ØØØÙ ØÙ ÙØÙ ØÙØØØØÙ ÙØ ØØØ ÙÙ ÙÙØÙÙØØÙ ØÙ ØÙ ØØÙÙÙÙ ÙÙ ØÙØØØÙÙ.</p>
+
+<p>ØÙØØ ØÙÙØÙØ ÙÙ ØÙÙÙ <a href="<page docs/tor-doc-relay>">ØØØ ØÙØØÙÙÙØ</a>.</p>
+
+<hr />
+
+<p>ØÙ ÙØÙØ ØÙØÙ ØÙØØØØØØ ÙØØØÙÙ ÙØÙ ØÙÙØÙÙØØ ÙØØÙ ØÙ <a href="<page
+contact>">ØØØÙÙØ ÙÙØ</a>. ØÙØØÙ ÙÙ.</p>
+
+  </div>
+<!-- #main -->
+</div>
+
+
+#include <foot.wmi>


Property changes on: website/trunk/docs/ar/tor-doc-windows.wml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: website/trunk/docs/el/tor-doc-unix.wml
===================================================================
--- website/trunk/docs/el/tor-doc-unix.wml	                        (rev 0)
+++ website/trunk/docs/el/tor-doc-unix.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+#include "head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8"
+<div class="center">
+
+<div class="main-column">
+
+<h1>ÎÎÏÎÎÎÏÎ ÏÎÏ ÏÎÎÎÏÎ <a href="<page index>">Tor</a> ÏÎ Linux/BSD/Unix</h1>
+<br />
+
+<p>
+<b>ÎÎÎÎÎÏÏÏÎ ÏÏÎ ÎÏÏÎÏ ÎÎÎÎÎ ÎÎÎÎÎÎÏ ÎÎÎÎÏÎÏÏÎÏÎÏ ÎÎÎ ÏÎÎ ÎÎÏÎÎÎÏÎ ÏÎÏ
+ÏÏÎÎÏÎÎÎÎÏÎÏ/ÏÎÎÎÏÎ Tor. ÎÎ ÎÎÎÎÏÎ ÎÎ ÎÎÎÎÎÏÎÎÎÎÎÏÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎ ÎÎÎÎÏÏ
+ÏÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎÏÎ ÏÏÎÎ ÎÎÎÏÏÏÎÎ ÏÎÏ ÎÎÎÏÏÎÏ (ÏÎÏÎÎÎÎÎÏÎÎ ÎÎ ÏÎ ÎÎÎÎÏÎ),
+ÎÎÎÎÎÏÏÎ ÏÎÎ ÎÎÎÎÏ <a href="<page docs/tor-doc-relay>">ÎÏÎÎÎÏÎ ÎÎÏÏ
+ÎÎÎÎÎÏÎÎÏÏÎ</a>.</b>
+</p>
+
+<hr /> <a id="installing"></a>
+<h2><a class="anchor" href="#installing">ÎÏÏÏÎ ÎÎÎÎ: ÎÎÏÎ ÎÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ
+Tor</a></h2>
+<br />
+
+<p>
+Î ÏÎÎÎÏÏÎÎÎ ÎÎÎÎÏÎ ÏÎÏ Tor ÎÏÎÏÎÎ ÎÎ ÎÏÎÎÎÎ ÏÏÎ ÏÎÎÎÎÎ <a href="<page
+download-unix>">ÎÎÏÎÏÎ</a>. ÎÎÎÎÎÏÎÏÎÎ ÏÎÎÎÏÎ ÎÎÎ Debian, Red Hat, Gentoo,
+*BSD ÎÎÎ ÎÎÎÎ. ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎ Ubuntu ÎÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎ ÏÎ ÎÏÏÎÎÎ ÏÎÎÎÏÎ:
+ÎÎÏ' ÎÏÏÏÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÏÎ <a href="<page docs/debian>#ubuntu">ÏÎ ÎÏÎÎÎÏÎÏÎÎ
+ÏÏÎ deb</a>.
+</p>
+
+<p>ÎÎ ÎÎÏÎÏÎÎÏÎÎÎÏÎ ÏÎ ÎÏÏÎÎÎ ÎÏÏ ÏÎÎ ÏÎÎÎÎÎ ÎÏÎÎÎÎ, ÏÏÏÏÎ ÎÎÎÎÏÎÏÏÎÏÏÎ ÏÎ <a
+href="http://www.monkey.org/~provos/libevent/";>libevent</a> ÎÎÎ ÎÎÎÎÎÏÎÎÎÏÎ
+ÏÏÎ ÎÏÎÏÎ ÏÎ openssl ÎÎÎ zlib (ÏÏÎÏÎÏÎÎÎÎÎÎÎÎÎÎÎÏÎ ÎÎÎ ÏÏÎ ÏÎÎÎÏÏÎ -devel,
+ÎÎ ÏÏÎÏÏÎÏÎ). ÎÎÏÎ ÎÎÏÎÎÎÏÏÎ: <br /> <tt>tar xzf
+tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br />
+<tt>./configure &amp;&amp; make</tt><br />.  ÎÏÏÎ ÎÏÎÏÎÎÏÎ ÎÎ ÏÏÎÎÎÏÎ ÏÎ Tor
+ÎÏÏ <tt>src/or/tor</tt> Î ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÏÎÎÎÏÎÏÎ <tt>make install</tt> (ÏÏ
+root, ÎÎ ÎÎÎÎÎ ÎÎÎÎÎÎÎÎ) ÎÎÎ ÎÎ ÎÎÎÎÏÎÏÏÎÎÎÎ ÏÏÎÎ ÎÎÏÎÎÎÎÎ /usr/local ÎÎÎ
+ÎÎÏÎ ÎÏÎÏÎÎÏÎ ÎÎ ÏÎ ÎÎÎÎÎÎÏÎÏÎ ÎÎÏÎÎÏÎÏÎÏ <tt>tor</tt>.
+</p>
+
+<p>ÎÎ Tor ÎÎÎÎÎ ÏÏÎÏÏÎÎÎÏÎÎÎÎ ÏÏ ÏÎÎÎÏÎÏ. ÎÏÎÏÎÎÎÏÎÎÎÎ ÎÎÎ ÎÎÏÏÎÎÏÏÎÎÎÎ ÎÏÏÎÎÎ
+ÎÏÏÎÎÏÎ ÏÏÎÎÎÏÎÏÎ ÎÎÎ ÎÎ ÏÎÏÎÏÏÏÏÎÏÎÎ ÏÏÎÏÏÎÏ ÎÎÎ ÎÎ ÏÏÎÎÎÏÏÎÎ ÎÎ ÎÎÎÎÏÎ
+ÎÎÎÎÎÎÏ. ÎÎ Tor ÎÎÎÎÎ ÏÏÏÎ ÎÎÎÎÏÎÏÏÎÎÎÎÎ.
+</p>
+
+<hr /> <a id="privoxy"></a> <a id="polipo"></a>
+<h2><a class="anchor" href="#polipo">ÎÎÏÏÎÏÎ ÎÎÎÎ: ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ Polipo ÎÎÎ
+ÏÎÏÎÎÎÎÏÎ ÏÏÎÎ ÎÏÏÏ</a></h2>
+<br />
+
+<p>ÎÎÏÎ ÏÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÎÏ Tor ÏÏÎÏÎÎ ÎÎ ÏÏÎÎÎÏÎÏÎ ÏÎÏ ÎÏÎÏÎÎÎÎÏ ÏÎÏ ÏÏÏÎ ÎÎ
+ÏÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎ.
+</p>
+
+<p>
+ÎÎ ÏÏÏÏÎ ÎÎÎÎ ÎÎÎÎÎ Î ÏÏÎÎÎÏÎ ÏÎÏ ÏÎÏÎÎÎÎÏÎÏ ÏÏÎÎ ÎÏÏÏ. ÎÎÎÎÎÎÏÏÎ
+ÎÎÎÎÎÎÏÏÏÎÏÎÏ ÏÎ <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/";>Polipo</a> ÎÏÏ ÏÎ
+ÎÏÎÎÎÏÎÏÎÎ ÏÎÏ ÏÏÎÏÎÎÎÏÎÏ ÏÎÏ. ÎÎ Polipo ÎÎÎÎÎ ÎÎÎÏ ÏÎÎÏÎÎÎÏÏÎÎÏ ÎÎÎÎÎÎÎÏÏÎÏ
+ÎÏÏÎÏ (proxy server) ÏÎÏ ÏÏÎÏÏÎÏÎÎÎÎ http pipelining ÎÎÎ ÎÎ' ÎÏÏÏ ÎÎÎÎÎ
+ÎÎÏÎÎÎÎÎÎ ÎÎÎ ÏÎÏ ÎÎÎÏÏÏÎÏÎÏÎÎÏ ÏÎÏ Tor.  ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÎÎ ÏÎÏÎÎÎÎÎÏÎ ÏÎ
+Polipo ÎÎ ÎÎÎÎÏÎ ÏÎÏÎÎÏÎÏÏÎÎ 1.0.4, ÎÏÎÏ ÎÎ ÏÎÎÎÎÏÏÎÏÎÏ ÎÎÎÏÏÎÎÏ ÎÎÎ
+ÏÏÎÏÏÎÏÎÎÎÏÎ ÏÎ ÏÏÏÏÏÎÎÎÎ SOCKS ÏÎÏ ÎÎÎÎÎ ÎÏÎÏÎÎÏÎÏÎ ÎÎÎ ÏÎ ÎÎÎÏÏÎ Tor. ÎÎ
+ÎÏÏÏ ÏÎ ÏÎÎÎÎÎ ÏÏÎÏÎÎ ÎÎ ÎÏÎÎÎÎÏÎÏÏÎÏÎÏÎ ÏÎ privoxy (Ï.Ï., apt-get remove
+privoxy Î yum remove privoxy) ÎÎÎ ÎÎ ÎÎÎ ÏÏÎÏÏÎÏÎ ÎÎÎÎÎÎÎÎÏ ÎÎÏÎÎÏ ÏÎÏÏ.
+</p>
+
+<p>ÎÏÎÎ ÎÎÎÎÏÎÏÏÎÏÎÏÎ ÏÎ Polipo (ÎÎÏÎ ÎÏÏ ÏÎÎÎÏÎ Î ÎÏÏ ÏÎÎ ÏÎÎÎÎÎ ÎÏÎÎÎÎ)
+<b>ÏÏÎÏÎÎ ÎÎ ÏÏÎÎÎÏÎÏÎ ÏÎ Polipo ÏÏÏÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎ ÏÎ Tor</b>. ÎÎÏÎÎÎÏÏÎ
+ÏÎÏ <a
+href="https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/polipo.conf";>ÏÎÏ
+ÏÏÎÎÎÏÎÎÏ ÏÎÏ Polipo ÎÎÎ ÏÎ Tor</a> ÎÎÎ ÎÎÏÎÎÏÎÏÏÎ ÏÎ ÏÏÎÎ ÏÏÎÏÎÏÏÎ ÎÎÏÎ ÏÎÏ
+ÎÏÏÎÎÎÏ ÏÏÎÎÎÏÎÏÎ (Ï.Ï., /etc/polipo/config Î ~/.polipo). ÎÏÎÏÎÎ ÎÎ
+ÎÏÎÎÎÎÎÎÎÎÏÎÏÎ ÏÎ Polipo ÎÎÎ ÎÎ ÎÏÎÏÎÎÏÏÎÏÎ ÎÎ ÎÎÎÎÎÎÏ.  ÎÎÎ ÏÎÏÎÎÎÎÎÎÎ: <br
+/> <tt>/etc/init.d/polipo restart</tt>.
+</p>
+
+<p>ÎÎÏÎ ÎÎÎ ÏÎ Polipo ÎÏÎÏÎÎÏÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎÏÎ ÏÎ Privoxy ÎÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/PrivoxyConfig";>ÎÏÏÏ
+ÏÎ ÏÎÏÎÎÎÎÎÎÎ ÏÏÎÎÎÏÎÏ</a>. ÎÎÎÎ ÎÏÎÏ ÎÎÎ ÏÎ ÎÏÎ ÎÏÏÎÎÎ ÏÏÎÎÎÏÎÏÎ
+ÏÏÎÏÎÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÏÎ 8118, ÎÎÎ ÏÏÎÏÎÎ ÎÎ ÎÎÏÎÎÎÎÏÎ ÏÎ Polipo ÎÎÎ ÏÎ
+Privoxy ÏÎÏÏÏÏÏÎÎÎ.</p>
+
+<hr /> <a id="using"></a>
+<h2><a class="anchor" href="#using">ÎÏÎÏÎ ÎÎÎÎ: ÎÏÎÎÎÏÏÎ ÏÎÏ ÎÏÎÏÎÎÎÎÏ ÏÎÏ ÏÏÏÎ
+ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎ ÏÎ Tor</a></h2>
+<br />
+
+<p>ÎÎÏÎ ÏÎÎ ÎÎÎÎÏÎÏÏÎÏÎ ÏÏÎ Tor ÎÎÎ Polipo ÏÏÎÏÎÎ ÎÎ ÏÏÎÎÎÏÎÏÎ ÏÎÏ ÎÏÎÏÎÎÎÎÏ
+ÏÎÏ ÎÎÎ ÎÎ ÏÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎ. ÎÎ ÏÏÏÏÎ ÎÎÎÎ ÎÎÎÎÎ Î ÏÏÎÎÎÏÎ ÏÎÏ ÏÎÏÎÎÎÎÏÎÏ
+ÏÏÎÎ ÎÏÏÏ.</p>
+
+<p>You should use Tor with Firefox and Torbutton, for best safety.  Simply
+install the <a href="https://addons.mozilla.org/firefox/2275/";>ÏÏÏÏÎÎÏÎ
+Torbutton</a>, ÎÏÎÎÎÎÎÎÎÎÏÏÎ ÏÎ Firefox ÎÎÎ ÎÎÏÏÎ ÎÏÎÎÎÎÎ.
+</p>
+
+<img alt="Torbutton plugin for Firefox"
+src="../img/screenshot-torbutton.png" border="1"> <br />
+
+<p>
+ÎÎ ÎÎÎÎÏÎ ÎÎ ÎÎÏÎÎÎÎÏÎ ÏÎÎ Firefox ÏÎ ÎÎÎÏÎÏÎÏÎÎÏ ÏÏÎÎÎÎÎÏÏÎ, ÎÎÎÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress";>
+ÏÎÏ ÎÎÎÎÎÎÏ ÏÎÏ FAQ ÎÎÎ ÏÎÎ ÎÎÏÎÎÎÏÎ ÏÎÏ Firefox ÏÎ ÎÎÎÏÎÏÎÏÎÎÏ
+ÏÏÎÎÎÎÎÏÏÎ</a>.
+</p>
+
+<p>ÎÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎ ÏÎ Tor ÎÎ ÎÎÎÎÏ ÎÏÎÏÎÎÎÎÏ ÏÎÏ ÏÏÎÏÏÎÏÎÎÎÏÎ
+ÏÎÎÏÎÎÎÏÏÎÎÏÏ ÎÎÎÎÎÎÎÏÏÎÏ (proxy) HTTP, ÎÎÎÏÎÎÏÎÎÎÎÏÏÎ ÏÎ ÎÏÏÎÏ ÏÎ Polipo
+(ÎÎÎÎÎÎ, ÏÎÎ ÏÎÏÎÎÎ ÎÏÏÎ 8118). ÎÎÎ ÎÏÎÏÎÎÎÎÏ ÏÏÎÏÎ ÏÎÏ SOCKS (ÎÎÎ ÎÎÎÏÎ
+ÎÎÎÏÎÎÏÎ, Jabber, IRC, ÎÎÏ) ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÏÎÏÎÏÎÎÏÎ ÏÎÎ ÎÏÎÏÎÎÎÎ ÏÎÏ
+ÎÎÏÎÏÎÎÎÎÎ ÏÏÎ Tor (ÏÎÏÎÎÎ ÎÏÏÎ 5050), ÎÎÎÎ ÎÎÎÎÎÏÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS";>ÎÏÏÎ
+ÏÎÎ ÎÎÏÎÏÏÏÎÏÎ FAQ</a> ÎÎÎ ÏÎ ÏÏÏ ÎÎÏÎ ÏÎÏÎÎÎ ÎÏÎÏÎÎ ÎÎ ÎÏÎÎÎÎÏÎÎÎ
+ÎÏÎÎÎÎÎÏÎÎ. ÎÎÎ ÎÏÎÏÎÎÎÎÏ ÏÎÏ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÏÎ SOCKS ÎÏÏÎ HTTP, ÎÎÎÎÎÏÏÎ ÏÎ
+<a href="http://tsocks.sourceforge.net/";>tsocks</a> Î ÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO#socat";>socat</a>.
+</p>
+
+<p>ÎÎÎ ÏÎÎÏÎÏÎÏÎÎÏ ÏÎÏ ÏÏÏÏÎÏ ÏÏÎÏÎÏ ÏÎÏ Tor ÎÏÏ ÎÎÎÎÏ ÎÏÎÏÎÎÎÎÏ, ÎÎÎÎÎÏÏÎ ÏÎ
+<a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>Torify
+HOWTO</a>.
+</p>
+
+<hr /> <a id="verify"></a>
+<h2><a class="anchor" href="#verify">ÎÎÎÎ ÎÎÏÎÏÏÎ: ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÎÎÏÎÎÏÎÎ</a></h2>
+<br />
+
+<p>
+<!--PO4ASHARPBEGIN<a href="http://ipchicken.com/";>
+this site</a>PO4ASHARPEND-->
+#to see what IP address it thinks you're using.
+ÎÏÎÏÎÎÎÏÎÎÎÎÏÏÎ ÏÎÎ ÏÎÏÎÎÎÎÏÎ ÎÏÏÎÏ ÎÎ ÏÎ Tor ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ Î ÎÎÎÏÎÏÎÏÎ
+ÏÎÏ IP ÎÎÎÎÎ ÎÎÏÎÏÎÎ. ÎÎÎÎÏÎ ÎÎÎÎ ÏÏÎÎ <a
+href="https://check.torproject.org/";>ÎÎÎÏÎÎÏÏÎ Tor</a> ÎÎÎ ÎÎ ÎÎÎÏÎÏÏÏÏÎÏÎ
+ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎ Tor. (ÎÎ Î ÎÏÏÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ, ÎÎÎÎÎÏÏÎ
+ÎÏÏÏ ÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate";>FAQ</a>
+ÎÎÎ ÏÎÏÎÏÏÏÏÎÏÎÏ ÏÏÎÏÎÏÎÎÏ ÏÏÏ ÎÎ ÎÎÎÎÎÎÏÎ ÏÎ Tor ÏÎÏ.
+</p>
+
+<p>ÎÎ ÎÏÎÏÎ ÎÎÏÎÎÎ ÏÏÎÏÏÏÎÎÏ ÏÎÎÏÎÏ ÏÏÎÏÏÎÏÎÎÏ ÏÎÏ ÏÎÏÎÎÏÎÎÎÎ ÏÎÎ ÎÏÎÎÏÏÏÎÏÎ
+ÏÏÎÎÎÏÎÏ ÏÎÏ ÏÏÎÎÎÎÎÏÏÎ ÏÏÎÎ ÎÎÎÎ (ÎÎÏÎ ÏÎÎ ÏÎ SELinux ÏÎÏ Fedora Core 4,
+ÎÎÏÎÎÏ ÎÎÎÏÎ), ÎÎÎÎÎÏÎÎÎÏÎ ÏÏÎ ÎÏÎÏÏÎÏÎÏÎ ÏÏÎÎÎÏÎÎÏ ÎÏÏ ÏÎÏ ÏÎÏÎÎÎÏ ÏÎÏ
+ÎÏÎÏÎÎÎÎÏ ÏÏÎÏ ÏÎ Polipo (ÏÎÏÎÎÎ ÎÏÏÎ 8118) ÎÎÎ ÏÎ Tor (ÏÎÏÎÎÎ ÎÏÏÎ
+9050). ÎÎ ÏÎ ÏÎÎÏÎÏ ÏÏÎÏÏÎÏÎÎÏ ÏÏÎÏÏÎÎ ÏÎÏ ÎÎÎÏÏÏÎÎÎÎÏ ÏÏÎÎÎÏÎÎÏ,
+ÎÎÎÎÎÏÏÎÎÏÏÎ ÎÎÎ "ÎÎÎÎÎÎÎ" ÏÏÏÎ ÎÎ ÎÏÎÏÎÎ ÎÎ ÏÏÎÎÎÎÏÎÎ ÏÎÏÎÎÏÎÏÏÎÎ ÎÎ ÏÎÏ
+ÎÏÏÎÏ TCP 80 ÎÎÎ 443 ÎÎÎ ÎÎÎÎÎÏÏÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient";>ÎÏÏÏ
+ÏÎ FAQ</a>. ÎÎ ÎÎ ÏÏÎÎÎÏÎÎÏ ÏÎÏ SELinux ÎÎÎ ÎÏÎÏÏÎÏÎÏÎ ÏÏÎ tor Î ÏÏÎ privoxy
+ÎÎ ÎÎÏÎÎÎÏÎÏÎÎ ÎÏÎÎ, ÎÎÎÎÎÏÏÎÎÏÏÎ ÎÎÎ ÎÏÏÎÎÎ ÎÎ ÏÎÎÎÎ booleans.local ÏÏÎÎ
+ÎÎÏÎÎÎÎÎ /etc/selinux/targeted. ÎÏÎÎÎÏÎÎÏÏÎÎÏÎ ÏÎ ÎÏÏÎÎÎ ÎÏÏÏ ÎÎ ÏÎÎ
+ÏÏÎÏÎÎÏÎ ÎÎÎÎÎÎÎÏ ÏÎÏ ÎÏÎÏÎÎÎÎÏ ÏÎÏ ÎÎÎ ÏÏÎÏÎÎÏÏÎ ÏÎÎ ÎÏÎÎÎÎ
+"allow_ypbind=1". ÎÏÎÎÎÎÎÎÎÎÏÏÎ ÏÎÎ ÏÏÎÎÎÎÎÏÏÎ ÏÎÏ ÏÏÏÎ ÎÎ ÎÏÎÏÎÎÏÎÎÏÎ ÎÎ
+ÎÎÎÎÎÎÏ.
+</p>
+
+<p>ÎÎ ÎÎÎÎÎÎÎÏÎÎÎ ÎÎ ÎÎÎ ÎÎÏÎÎÏÎÎ, ÏÎÎÏÎ ÎÎÎ ÎÎÏÎÎ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>ÏÎ
+ÎÏÏÏ ÏÎ FAQ</a> ÎÎÎ ÏÏÎÎÎÏÎÎÏ.</p>
+
+<hr /> <a id="server"></a> <a id="relay"></a>
+<h2><a class="anchor" href="#relay">ÎÎÎÎ ÎÎÎÏÏÎ: ÎÏÎÎÎÏÎ ÏÏ ÎÎÎÎÎÎÎÏÎÏ
+ÎÎÎÎÎÏÎÎÏÏÎ</a></h2>
+<br />
+
+<p>ÎÎ ÎÎÎÏÏÎ Tor ÎÎÏÎÎÎÏÎÎ ÏÎ ÎÎÎÎÎÎÏÎÏ ÏÎÏ ÏÎÏ ÏÎÏÎÏÎÏÎ ÎÏÏÎÏ ÎÏÎÎÏ. ÎÏÎ
+ÏÎÏÎÏÏÏÏÎÏÎÎ ÎÎÎÏÏÏÎÎ ÎÎÏÎÎÎÏÎ ÎÎÎÎÎÎÎÏÎÏÏ ÎÎÎÎÎÏÎÎÏÏÎÏ, ÏÏÏÎ ÎÏÎÎÎÏÏÏÎÏÎ ÎÎ
+ÎÎÎÎÎ ÏÎ ÎÎÎÏÏÎ Tor. ÎÎ ÎÎÎÎÎÏÎÏÎ ÏÎÏÎÎÏÎÏÏÎÎ 20 kilobytes/second ÏÏÎÏ ÎÎÎÎ
+ÎÎÏÎÏÎÏÎÏÎ, ÎÎÎÎÎÏÏÎ ÏÎ Tor ÏÏÎÎÎÎÎÎÏÎÏ ÏÎ ÏÏÏÎ ÎÎ ÎÎÎÎÎ ÎÎÎ
+ÎÎÎÎÎÏÎÎÏÏÎÏ. ÎÎÎÎÎÏÎÏÎÎ ÏÎÎÎÎ ÏÎÏÎÎÏÎÏÎÏÏÎÎÎ ÏÎÏ ÎÎÎÎÏÏÎÏÎ ÏÎÏÏ
+ÎÎÎÎÎÏÎÎÏÏÎÏ Tor ÎÏÎÎÎÎÏÏ ÎÎÎ ÎÎÎÎÎÎÏÏ, ÏÏÏÏ ÏÎÎ ÏÎÏÎÎÏÎÏÎÏ ÏÎÏ ÎÏÏÎÏÏ
+ÎÏÎÎÏ, ÏÎÎÎÏÎÎÎÏ ÎÎÏÎÎÏ ÏÏÏÎ ÎÎ ÏÎÏÎÎÏÎÎÎÏÎ ÏÎÎ ÎÎÎÎÏÎ ÏÎ ÎÎÎÎÎÏÏÏÏÎÎÏ ÎÎÎÎÏ
+ÏÏÎÏÎÏ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎ ÎÏÎÎÎÎÎÎÏ ÎÎÎÏÎÏÎÏÎÏ ÎÎ, ÎÎÏÎÎÏ ÎÎÎÏÎ.</p>
+
+<p>Î ÏÏÎÏÎÎ ÎÎÎÎÎÏÎÎÎÏÏÎ ÏÎ ÏÎÎÎÎ ÏÎÎÎÎÎ ÏÎÏ ÎÎÎÎÎÎÏÏÎÏ ÎÎÎÎÏÏÎ ÏÎ Tor ÎÏÏÎÎÎÏ
+ÎÎÎ ÏÎÏÏ ÏÏÎÏÏÎÏ. <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>ÎÏÎÎÏ
+ÎÎ ÎÎÎÎÎ ÎÎ ÎÏÎÎÎÎÎÎÎÎÏÎ ÎÏÏÏÏÏÏÎÏÎ ÎÎÏÎÏÎÎÎ</a>, ÎÏÎÏ ÎÎ ÎÏÎÎÎÎÏÏÏÎÎÎÎÎ
+ÎÎÎÎÎÎÏÏÎÎÎÎ ÏÏÏÎÎ ÎÎÎ ÎÏÎÏÎÏÎ ÎÎ ÎÎÏÏÎÎÎÏÎ ÎÎ ÎÎ ÏÏÎÎÎÏÎÎÏ ÏÏÎÎÏÏÎÎÏÎÎ ÎÏÏ
+ÏÎÎ ÏÏÎÎÎÎÎÏÏÎ ÏÎÏ Î ÎÎÎÎÎÏÎÎÎÎÎÎÏÎÎ ÎÏÏ ÎÎÎÎÏÏ.</p>
+
+<p>ÎÎÎÎÎÏÏÎ ÏÎÏÎÏÏÏÏÎÏÎ ÏÏÎÎ ÎÎÎÎÏ ÎÎÏ <a href="<page
+docs/tor-doc-relay>">ÎÏÎÎÎÏÎ ÎÎÏÏ ÎÎÎÎÎÏÎÎÏÏÎ</a>.</p>
+
+<hr />
+
+<p>ÎÎ ÎÏÎÏÎ ÏÏÎÏÎÏÎÎÏ ÎÎÎ ÏÎÎ ÎÎÎÏÎÏÏÎ ÎÏÏÎÏ ÏÎÏ ÎÎÎÏÎÏÎÏ, ÏÎÏÎÎÎÎÎÏÎÎ ÎÎ <a
+href="<page contact>">ÎÎÏ ÏÎÏ ÏÏÎÎÎÎÏÎ</a>. ÎÏÏÎÏÎÏÏÎÏÎÎ!</p>
+
+  </div>
+<!-- #main -->
+</div>
+
+
+#include <foot.wmi>


Property changes on: website/trunk/docs/el/tor-doc-unix.wml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: website/trunk/docs/el/tor-doc-web.wml
===================================================================
--- website/trunk/docs/el/tor-doc-web.wml	                        (rev 0)
+++ website/trunk/docs/el/tor-doc-web.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+#include "head.wmi" TITLE="Tor: Configuring your browser to use Tor" CHARSET="UTF-8"
+<div class="center">
+
+<div class="main-column">
+
+<h1>ÎÏÎÎÎÏÎ ÏÎÏ ÏÎÏÎÎÎÎÏÎ ÎÏÏÎÏ ÎÎÎ ÏÏÎÏÏÎ ÏÎÏ <a href="<page index>">Tor</a></h1>
+<br />
+
+<p>ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎ Firefox (ÏÎÎ ÏÏÎÎÏÏÎÏÎÎ) ÎÎÎ ÏÏÎÎÎÎÎÏÏÎ ÎÏÏÎ ÏÎÎ
+ÏÎÎÎÎÎ. ÎÏÎÏÏ ÎÎÎÎÏÎÏÏÎÎÏÏÎ ÏÎ <a
+href="https://addons.mozilla.org/firefox/2275/";>ÏÏÏÏÎÎÏÎ Torbutton</a>,
+ÎÏÎÎÎÎÎÎÎÎÏÏÎ ÏÎÎ Firefox ÎÎÎ ÎÎÏÏÎ ÎÏÎÎÎÎÎ:
+</p>
+
+<img alt="Torbutton plugin for Firefox"
+src="../img/screenshot-torbutton.png" border="1"/> <br />
+
+<p>ÎÎ ÎÎÎÏÎÏÎÏÎÎÎ ÏÎÏÎÏÏÏÏÎ, ÏÏÎÏÎÎ ÎÎ ÏÏÎÎÎÏÎÏÎ ÏÎÎÏÎÎÎÎÎÏÎ ÏÎÏ ÏÏÎÎÎÏÎÎÏ
+ÏÎÎÏÎÎÎÏÏÎÎÏ ÎÎÎÎÎÎÎÏÏÎ (proxy server) ÏÎÏ ÏÏÎÎÎÎÎÏÏÎÏÎ ÏÎÏ. <br/>ÎÏÎÎ
+Mozilla ÎÎÎ ÏÎÎ Firefox ÎÎÎ Windows ÎÏÏÏ ÎÎÎÎÏÎÎ ÎÎÏÏ
+ÎÏÎÎÎÎÎÎ-ÎÏÎÎÎÎÎÏ-ÎÎÎÎÎÎ-ÎÏÎÎÎÏÎÎÏ ÏÏÎÎÎÏÎÏ.  <br/>ÎÏÎÎ Firefox ÏÎ OS X,
+ÎÎÏÏ Firefox-ÎÏÎÏÎÎÎÏÎÎÏ-ÎÎÎÎÎÎ-ÎÏÎÎÎÏÎÎÏ ÏÏÎÎÎÏÎÏ. <br/>ÎÏÎÎ Firefox ÏÎ
+Linux ÎÎÏÏ ÎÏÎÎÎÏÎÎÏÎÎ-ÎÏÎÏÎÎÎÏÎÎÏ-ÎÎÎ ÏÏÎÏÏÏÎÎÎÎÎÏÏ-ÎÎÎÏÏÎ. <br/>ÎÏÎÎ Opera
+ÎÎÏÏ ÎÏÎÎÎÎÎÎ-ÎÏÎÏÎÎÎÏÎÎÏ (ÎÎÎ ÏÏÎÏÏÏÎÎÎÎÎÏÏ)-ÎÎÎÏÏÎ-ÎÎÎÎÎÎÎÏÏÎÏ. <br/>ÎÎ
+ÎÎÎ ÎÎÎ ÏÏÎÎÏÏÎÏÎÎ ÏÎÎ ÏÏÎÏÎ ÎÎ, ÎÎ ÏÏÎÎÎÏÎÎÏ ÎÎÎ ÎÎÏÎÏÎÎÎ ÏÎÏÎÎÏÎÏÎÎÎÎÏ
+ÎÎÎÎÎÏ ÎÎÎÎÎ ÎÎÏÏ ÎÏÎÎÎÎÎÏÎ-ÎÏÎÎÎÎÎÏ Internet-ÎÏÎÎÎÏÎÎÏ-ÎÏÎÎÎÏÎÎÏ
+LAN-ÎÎÎÎÏÎÏ ÎÎÎÎÎÎÎÏÏÎ Proxy-ÎÎÎ ÏÏÎÏÏÏÎÎÎÎÎÏÏ.</p>
+
+<img alt="Proxy settings in Firefox"
+src="../img/screenshot-win32-firefox-proxies.jpg" />
+
+<p>
+ÎÏÎÏÎÎ ÎÎ ÏÏÎÏÎÎÏÏÏÎÏÎ ÏÎ "localhost" ÎÎÎ "8118" ÏÏÏÎ ÎÎ ÎÎÏÎÏÏÎÎÏÎÏÎ ÏÏÎ
+ÏÎÏÏÎÏÎ ÏÏÏÏÏÎÎÎÎ ÏÎÏ Polipo, ÏÏÏÏ ÏÎÎÎÎÏÎÎ ÎÎÏ. (ÎÎ ÎÎÎ ÏÎ Polipo ÎÎÎ
+ÏÏÎÏÏÎÏÎÎÎÎ FTP ÎÎÎ Gopher, <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FtpProxy";>ÏÏÎÏÎÎ
+ÏÎÏ' ÏÎÎ ÎÏÏÎ ÎÎ ÏÎ ÎÎÎÏÎÎÏÎÎÎÏÎÏÎ</a>. ÎÏÎÏÎÎ ÎÏÎÏÎÏ ÎÎ ÏÏÎÏÎÎÏÏÏÎÏÎ ÏÎÎ
+ÏÎÎÏÎÎÎÏÏÎÎ ÎÎÎÎÎÎÎÏÏÎ socks ÏÏÏÎ ÎÎ ÎÎÏÎÏÎÏÎÎÏÎÎ ÎÎÎÏÎ ÏÏÎ Tor
+("localhost", "9050" ÎÎÎ socks5) ÏÏÏÎ ÎÎ ÎÎÎÏÏÏÎÎÏÎÎ ÎÎÎ ÏÏÏÏÏÎÎÎÎ ÏÎÏÎÎ ÏÏÎ
+ÏÎÏÏÎÏÏÎ ÏÏÏÏÏÎ. ÎÎÏÎÏÏÎ "ÎÎ".</p>
+
+<hr />
+
+<p>ÎÎ ÎÏÎÏÎ ÏÏÎÏÎÏÎÎÏ ÎÎÎ ÎÎÎÏÎÏÏÎ ÎÏÏÎÏ ÏÎÏ ÎÎÎÏÎÏÎÏ, ÏÎÏÎÎÎÎÏÎÎ <a
+href="<page contact>">ÎÎ ÎÎÏ ÏÎÏ ÏÏÎÎÎÎÏÎ</a>. ÎÏÏÎÏÎÏÏÎÏÎÎ!</p>
+
+  </div>
+<!-- #main -->
+</div>
+
+
+#include <foot.wmi>


Property changes on: website/trunk/docs/el/tor-doc-web.wml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: website/trunk/et/bridges.wml
===================================================================
--- website/trunk/et/bridges.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/et/bridges.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -35,15 +35,16 @@
 </p>
 
 <p>
-Pane tÃhele, et Tori mittefunktsionaalsusel vÃivad olla ka teised
-pÃhjused. Viimane versioon <a href="<page torbrowser/index>">Tori pakist
-veebilehitsejale</a> Windowsil proovib anda sulle paremaid vihjed selle
-kohta, miks Toril on probleemid Ãhenduse loomisega. Sa peaksid ka lugema <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>KKK-d
-probleemide kohta Tori Ãige jooksutamisega</a> kui sul on probleeme. Kui sa
-oled kindel, et probleemiks on blokeerimine vÃi soovid lihtsalt proovida,
-loe edasi. Tee kindlaks, et sa kasutad <a href="<page download>#Dev">viimast
-0.2.1.x vÃi 0.2.2.x pakki enda platvormile</a>.
+Note that it's also possible that Tor is non-functional for other
+reasons. The latest version of <a href="<page torbrowser/index>">The Tor
+Browser Bundle</a> on Windows tries to give you better hints about why Tor
+is having problems connecting. You should also read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>the
+FAQ about problems with running Tor properly</a> when you have issues.  If
+you feel that the issue is clearly blocking, or you'd simply like to try
+because you're unsure or feeling adventurous, please read on. Ensure that
+you're using the <a href="<page download>#Dev">latest 0.2.1.x or 0.2.2.x
+bundle for your platform</a>.
 </p>
 
 <p>
@@ -147,9 +148,9 @@
 docs/tor-doc-relay>">Tor releed</a>, siis sa vÃiksid jooksutada
 sildreleed. Sa vÃid selle konfigureerida kahel moodusel:
 <ul>
-<li> manuaalselt <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>muutes
-enda torrc faili</a> jÃrgnevalt:<br />
+<li> manually <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>edit
+your torrc file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -162,11 +163,10 @@
 </ul>
 </p>
 
-<p>Kui sa saad "Could not bind to 0.0.0.0:443: Permission denied" veateateid
-Tori kÃivitades, siis sa pead valima kÃrgema ORPort vÃÃrtuse, nÃiteks 8080
-vÃi tegema <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>pisut
-keerulist portide edasisuunamist</a>.
+<p>If you get "Could not bind to 0.0.0.0:443: Permission denied" errors on
+startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>some
+complex port forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/et/download.wml
===================================================================
--- website/trunk/et/download.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/et/download.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -247,12 +247,14 @@
 </li>
 
 <li>
-Tor muudab su liikluse pÃritolu anonÃÃmseks ja krÃpteerib kogu Ãhenduse sinu
-ning Tor vÃrgu vahel ja Tor vÃrgu sees, kuid <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>ei
-saa maagiliselt krÃpteerida liiklust sinu ja lÃppsihtkoha vahel</a>. Kui sa
-saadad Ãle vÃrgu tundlikku informatsiooni, siis sa peaksid kasutama HTTPS
-protokolli vÃi muud krÃpteeringut enda ja lÃppsihtkoha vahel.
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network, but
+<a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you should
+use as much care as you would on the normal scary Internet &mdash; use HTTPS
+or other end-to-end encryption and authentication.
 </li>
 
 <li>

Modified: website/trunk/fa/bridges.wml
===================================================================
--- website/trunk/fa/bridges.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fa/bridges.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -1,86 +1,207 @@
-## translation metadata
-# Based-On-Revision: 15733
-# Last-Translator: foo
 
-#include "head.wmi" STYLESHEET="stylesheet-rtl.css" TITLE="Tor: Bridges" CHARSET="UTF-8"
 
-<div class="main-column" lang="fa">
 
+
+
+
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 1-high
+#include "head.wmi" TITLE="Tor: Bridges" CHARSET="UTF-8"
+<div class="main-column">
+
 <a id="BridgeIntroduction"></a>
-<h2><a class="anchor" href="#BridgeIntroduction">Tor: ÙÙ ÙØ</a></h2>
+<h2><a class="anchor" href="#BridgeIntroduction">ØÙØ: ØØÙØ ÙØ</a></h2>
 <hr />
 
 <p>
-ØÙØØÚØÙ ÙØÛ ÙØØØÙ ÙÙÛ (ÙØ ØÙ ØÙØ ØØØØØØ "ÙÙ Ù") ØÙØØÚØÙ ÙØÛ ÙØØØÙ Tor ÙØØÙØ ÚÙ ØØ ÙÙØØØ ØØÙÛ Tor ÙØØÙØ. ØØ ØÙØØ ÚÙ ÙÙØØ ØÙÙÙÛ ÚØÙÙÛ ØØ ØÙÙØ ÙØÙØ ÙØØØØØ ØØÛ ØÚØ ISP ØÙØ ÙÙØ ØØØØÙ ØÙ ÙÙÙ ØÙØØÚØÙ ÙØÛ ÙØØØÙ Tor ØÙØØØÙ ØØÙ ØØ ÙÙÙØØ ÚØØÙ ØØØØØ ØØØÙØÙØÙ ÙÙÛ ØÙØÙÙØ ÙÙÙ ÙÙ ÙØ ØØ ÙØØÙØ ÚÙÙØ. ØÚØ ÙØÚÙÚ ÙØØÙØ ÚÙ ØØØØØÛ ØÙØ ØÙ ØØÚÙ Tor ÙØØÙØ ØØÙØ ÙÛ ØÙØÙÙØ ØØ ÙÙÚÚÛ ÙÙ Tor ØØØÙØØÙ ÚÙÙØ.
+ØÙÙâÙØÙ ÙÙÙ (ÙØ ØÙ ØÙØØ ÙÙØØÙ ØØÙØ "ÙÙâÙØ") ØÙÙâÙØÙÙ ØØ ØÙØ ÙØØÙØ ÙÙ ØØ
+ÙÙÙØØ ØØÙÙ ØÙØ ÙØØØ ÙØØØÙØ. ÙØØØÙÙââÙÙ ÙÙ ÙÙØØ ØÙÙÙÙ ØØ ØÙÙØ ÙØÙØ ÙØØØØÙ
+ØØØØØ ØØÙ ØÚØ ØØÙÙØ ØÙÙØÙ ØÙÙØØÙØÙ ØÙØ ØÙØØÙ ØÙ ÙÙÙØØ ÙØØÙ ØÙØÙÙ ØÙÙâÙØÙ
+ØÙØØØÙ ØØÙ ØÙØ ØÙÙØØ ØØØÙØÙØÙ ÙØØØ ØÙ ÙØØÙØ ÙØØÙ ØÙØÙÙ ÙÙâÙØ ÙØÙØÙØ ØÙØ. ØÚØ
+ØÙØ ØÙ ØØØÙØ ÙÙ ØØØØØÙ ØÙ ØØÙÙ ØÙØ ÙØØÙØ ØØÙ ØØØØ ÙÙÙÙ ØØØ ÙØÙÙ ØØØÙØ ÙÙ ØØ
+ØÙÙØÙ ÙÙ ØØ ØÙØ ØØØÙØØÙ ÙÙÙØ.
 </p>
 
 <p>
-ØÙØÙØÙ ÙÙ ÙØ ØÙ Tor ÚØÙÛ ØÙ ØÙÙ ØØ ØÙØØØ ØØØØÚØÙ ÙØØÙØ ÚØØÙ ØØØ. ÚØÙÙØÙ ØÙÚØÙ ÙØÙØ ØØØ ÚÙ ØØÛ ØÚØ ISP ØÙØ ØÙÙØØÙØ ØØ ÙÙÙØØ ÚØØÙ ØØØØØ ØØØÛ ØØØÙØØÙ ØØ Tor ØÙ ÙÙ ØØØÙØØ ÙØØØÙØ. ØØÙØØÛ ØØ ØØÙØÙÙ ÙØÛ ÙÙÙØØÙÙÚ ÚÙ ØÙ ØÙØØÙ ÙÙØØØ Tor ÚØÚØØØÛ ÙØØÙ ÙØØÙØØ ØØÙØ ØØØÙØ ØÙÙØ ÚÙ ØÙØ ØØ Tor ØØØÙØØÙ ÙÛ ÚÙÙØØ ØÙØ ÙØØÙ 0.2.0.23-rc Ù ÙØØÙ ÙØÛ ØØÙØØØ Tor ØÙ ØÙØ ÙÙØ ÙØØ ØØ ØØØÙØØØ ÙÙØØØ ÚØÚØØØÛ ØØÙ ØØØÙØØÙ ÙÛ ÚÙÙØ. ØÙÙ ØØÙÙØ ÙØÙÛ ØÙÙÚÙ ØÚØØ ØØÙØÙÙ ÙØÛ ÙÙÙØØÙÙÚ ÙØØØ ÙÙØØÙØ ØØØØÙØØ Tor ØØ ØØØÙØ ØÙÙØ. ØÙØØØØÙÙ ØÙØ ØØÙØ ØØØØØ ØØÛ ÚÙÙØ ÚÙ ØØÙÙ ÙÙ ØØ Tor ØØØÙØØÙ ÚÙÙØØ ØÙØØ ÙÙÚÙ ØØØ ÚØØ ÚÙØ.
+ØÙÙØÙ ØØØÙÙâØØ ÙÙâÙØ ÙØØØ ØÙ ØÙØ ØÙÙ ØØØ ÙÙ ÙÙ ÙØØÙÙ ØÙÙØØ ØØ ÙØØÙØÙØ ØØÙØÙ
+ØØÙ ØÙÙ ÙÙâÙÙØ. ÙÙÙØÙ ØÙÙØÙÙØÙØ ØØØ ÙÙ ØØÙ ØÚØ ØØÙÙØ ØÙÙØÙ ØÙÙØØÙØÙ ØÙØ
+ØØØØØÙ ØÙ ØÙÙØØÙØ ØØ ÙØØÙØ ÙØØÙ ØØØØØ ØÙØ ØØØÙØØÙ ÙØÙØÙÙØ ØØØØ ÙÙ ÙÙ ØØ ØÙØ
+ØØØÙØØÙ ÙÙØ. ØØÙØØÙ ØØ ØØÙØÙÙâÙØÙ ÙÙÙØØÙÙÚØ ØÙØØÙ ÙÙÙØØ ØÙØÚØØØÙ ÙØØÙ ØÙØ
+ÙÙâÚØØÙØ ØØ ÙØÙØÙ ØÙÙØ ØÙØ ØØ ØÙØ ØØØÙØØÙ ÙÙâÙÙÙØØ ÙÙÙ ÙÚØØØ <span
+dir="ltr">0.2.0.23-rc</span> ØØ ØÙØ Ù ØØØ ØØ ØÙ ØØ ÙÙÙØØ ØÙØÙÚØØÙ ØØÙ ØÙ
+ØÙØØ ÙÙØ ÙØØ ØØØÙØØÙ ÙÙâÙÙØ. ØÙÙ ØØÙÙØØØ ØØÙÙ ÙØÙÙ ØØØ ÙÙ ØÙØØ ØØÙØÙÙâÙØÙ
+ÙÙÙØØÙÙÚ ÙØØØ ØÙ ØÙØØØÙÙ ØØØØØØØØ ØÙØ ÙØÙØÙÙØ ØÙØ. ØÙØØØØÙÙ ÙÙâØÙØÙÙØ ØØ ØÙØ
+ØØ ØÙØÙÙâÙÙ ØÙ ØÙÙØÙÙ ÙØØ ÙÙâÙÙØØ ØØÙÙ ÙÙâÙØ ØØØÙØØÙ ÙÙÙØ.â
 </p>
 
 <p>
-ØÙØÙ ØØØØÙ ØØØÙØ ÚÙ ÙÙÚÙ ØØØ Tor ØÙ ØÙØÙÙ ØÙÚØÛ ØÙÙ ÙÚÙØ. ØØÙØØØÙÙ ÙØØÙ <a href="<page torbrowser/index>">ØØØÙ ÙØÙ ØÙØØØÛ ÙØÙØÚØ Tor</a> ØÙÛ ÙÙÙØÙØ ØØÛ ØØ ØÙÙ ØÙØÙ ÚÙ ÙÚØØ ØÙØØÛ ØØØØØÙ ØÙØ ØØÚØÙ ØØ ØØØØÙ Tor ØØ ØØØÙØØ ØÙØ ÙØØØ ØÙØ. ØØ ØÙØØ ØØÙØ ÙØÚÙØ ØØÙØ <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>ØØØÙØØ ÙØØØÙÙ ØØØØØÙ ÙØÚÙØØ ØØØØÛ ØØØØ Tor </a> ØØ ÙÙØ ÙØØÙØÙ ÚÙÙØ. ØÚØ ØØØØØ ÙÛ ÚÙÙØ ÚÙ ÙØÚÙ ÚØÙÙØÙ ÙØØÙØ ØØÙ ØØØØ ÙØ ÚÙÙ ÙØÙØÙ ÙÙØØÙØ ÙØ ØÙ ØÙÙÙ ÚÙØÚØÙÛ ÙÛ ØÙØÙÙØ ØÙØØØÙ ÚÙÙØØ ÙØÙØÙ ÙØØÙØÙ ÚÙÙØ. ØØÙÙÙØÙ ØØØÙ ÚÙÙØ ÚÙ ØØ <a href="<page download>#Dev">ØØÙØØØÙÙ ØØØÙ ÙØÙ ØÙØØØÛ 0.2.1.x ÙØ 0.2.2.x</
 a> ØØØÙØØÙ ÙÛ ÚÙÙØ.
-
+Note that it's also possible that Tor is non-functional for other
+reasons. The latest version of <a href="<page torbrowser/index>">The Tor
+Browser Bundle</a> on Windows tries to give you better hints about why Tor
+is having problems connecting. You should also read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>the
+FAQ about problems with running Tor properly</a> when you have issues.  If
+you feel that the issue is clearly blocking, or you'd simply like to try
+because you're unsure or feeling adventurous, please read on. Ensure that
+you're using the <a href="<page download>#Dev">latest 0.2.1.x or 0.2.2.x
+bundle for your platform</a>.
 </p>
 
 <p>
-ØØØÛ ØØØÙØØÙ ØØ ÙÙØ ØØÙØ ÙÚ ÙÙ ØØ ÙÙØØ ÚÙÙØ. ØÙØÙÙ ØØ ØÙØ ÙÙÚÙ ØØØ ÙØØÙ ØØØØ Tor ØØ ØØ ÙØ ØØØØ ÙÙÛ ÚÙ ØÙØ ØØØÙØØÙ ØØ ÙØØ ØØØÙØØ ÙÙÚØØÙØÛ ÚÙÙØ. ØÙÙ ÚØØ ØØ ØØ VidaliaØ ÚÙØØÙ ÚÙÙØÙ Tor ØÙØØÙ ØÙØÙÙØ ØØØ. ØÚØ ØØØØÙ ØÙÙØØÙØ ØÙØ ØØØÙØØÙ ØØ proxy ØØ ØØØÙØØØ ÚÙØØ ØØØÙØÙØÙ ØØØØØ ØØÙØ Vidalia ØØ ÙÙÚØØÙØÛ ÚÙÙØ. ØÚØ ÙÚØ ÙÛ ÚÙÙØ ÙÙØØÛ ØÙ ÙÙÚØØÙØÛ ÙØÙÚØÛ ØØØÛ ØØØØÙ ØÙÙØØÙØ ØÙØ ÙØØØÙØØ ÙÛ ØÙØÙÙØ ØÙÙ ÚØØ ØØ ÙÚÙÙØ. ØÙØØØÙ ÚÙÙØ Ù ØÚØ ØÙ ÙØÚÙ ØØØÙØØÙØØ ØØ ÙØ ØØÙÙÙØÙÛ ØØÙØÙÙØ.
+ØØØÙ ØØØÙØØÙ ØØ ÙÙ ÙÙØ ØØØÙØØ ØÙØÙÙØ ØØØØ ØØ ÙÙÙ ØØ ØÙÙØ ØØ ØÙØØØØ
+ÙÙÙØ. ØØÙØÙÙØ ØØØÙØØ ØÙØÙÙØ ØØØØ ØØ ØÙØ ØØ ØÙØÙÙ ÙÙÙØ ÙÙ ØØ ÙÙ ØÙØØØØ ØØÙ
+ØÙØ ÙØØ ÙÙØ. ØÙØ ØÙÙ ÙØØ ØØ ØÙ ÙØÙÙÙ ÙÙØØÙÙØ ÙÙ ÙÙØØÙ ÙÙÙØÙ ØÙØ ØØØ ØÙØØÙ
+ØÙØÙÙØ ØØØ.   ØÚØ ØØØØØØ ØÙÙØØÙØÙ ØÙØ ÙÙØØ ØÙ ØØØÙØØÙ ØØ ÙØØÙØÙ ØØØØØ ÙÙÙÙ
+ØØØ ÙØØÙ ØØØØ ØÙÙ ÙÙØØÙÙØ ØØ ØØØÙ ØØØÙØØÙ ØØ ØÙ ØÙØÙÙ ÙÙÙØ. ØÚØ ÙÙØ ÙÙâÙÙÙØ
+ÙÙ ÙÙØØÙ ØÙ ØÙØÙÙØØ ÙØØÙØÙ ØØØÙ ØØØØØØ ØÙÙØØÙØÙ ØÙØ ÙØØØÙØØ ØØØÙØÙØÙ ØÙÙØØÙØ
+ØÙØ ØÙ ÙØØÙØÙ ØØØÙ ØØØØØØ ØØØÙØØÙ ÙØØØØ.  ØØ ØÙÙ ØØÙØ ØØÙ ÙÙÙØ Ù ØÚØ ÙØÙÙÙ
+ØØØØÙØØ ØØ ÙØ ÙÙÙ ØØÙØÙÙØ.
 </p>
 
+<p>ØØÙÙ ØØØØÙØ ÙÙ ÙÙØØÙ ØØ ØØÙØ ÚÚÙÙÚÙ ÚØÙØÙ Ù ØØØÙØØÙ ØØ ÙÙâÙØÙ ØÙØ ØÙÙÙ ÙØØÙ
+ØØØ.  ØÚØ ÙÙØØÙÙ ØÙØ ØØ ÙÙÙâØÙÙÙØØ ÙÙâØÙØÙÙØ ØÙ ØØ ØØ ØØØØ <span
+dir="ltr"><a href="http://www.youtube.com/freedom4internet";>Youtube:
+Freedom4Internet</a></span>ÙØØÙØÙ ÙÙÙØ. ØÚØ ÙÙØØÙÙ ØÙØØÙ ØØØÙØ ÙØ ØÙÙÙÙ ØØØÙ
+ØÙ ØØ ØÙ ØØØÙ ØÙØ ØØØÙÙ ÙØØÙ ØØØØ ØÙ ÙØ ØØÙØØ ØÙÙØ.</p>
+
+<div class="center">
+<p><video id="v1" src="http://media.torproject.org/video/2009-using-a-bridge-relay-to-access-tor.ogv"; autobuffer="true" controls="controls"></video></p>
+</div>
+
 <p>
-ØØ ØØÙ ØØØØØ ØØ ÙØØØØÙ ØÙ <a href="https://bridges.torproject.org/";>https://bridges.torproject.org/</a> ØØ ÙØÙØÚØ ÙØ ØÙØØ ÙÛ ØÙØÙÙØ ÙÚ ÙÙ ØÙ ØØØ ØÙØÙØ. ØÚØ ØÙÙ ØÙØÙ ÙÙÙØØ ØØÙ ØØØØ Ù ØÙØ ÙØÙÚØÛ ÙØ ØÙØ ØÙÚØÛ ØØØÛ ØØØÙØØÛ ØÙ ØÙ ÙØØØÙØØ <a href="#FindingMore">ØØÙ ÙØÛ ØÙÚØÛ ØØØÛ ÙØÙØÙ ÙÙ ÙØ</a> ÙÙØ ÙØÙØ ØØØØ.
+ØØ ØÙÙ ÙØØÙØâ ØÙØ ÙØØØ ÙØØÙØ ÙÙ ÙÙ ØØ ØØ ÙØØØØÙ ØÙ <span dir="ltr"><a
+href="https://bridges.torproject.org/";>https://bridges.torproject.org/</a></span>
+ØÙØØ ÙØÙØÚØ ØÙØ ØØÙØÙØ ÙÙÙØ. ØÚØ ØÙÙ ØÙØÙ ØØØÙ ØÙØ ÙÙÙØØ ØØÙ ØØØ ÙØ ÙØØÙØÙ
+ØÙÚØÙ ØØØÙ ØØØØØÙ ØÙ ØÙ ÙØØØÙØØ ØØÙÙØÙ ØÙÚØÙ ØØ <a
+href="#FindingMore">ØÙÙØØ</a> ÙÙØ ÙØÙØ ØØØÙØ.
 </p>
 
 <a id="Understanding"></a>
-<h2><a class="anchor" href="#Understanding">ØÙØØØ ÙÙ ÙØ</a></h2>
+<h2><a class="anchor" href="#Understanding">ØÙØØØ ÙÙâÙØ</a></h2>
 <hr />
 
 <p>
-ØÙ ØÙÙØÙ ÙØØÙØ ÙÚ ÙØØÙ ÙÙ ØÙ ØØØ ØÙØÙÙØ ØÙØØ ÚÙ ØÙ ØÚÙ ØÙØ ÙØØÙØ:<br />
+ØØÙÙØÙ ÙÙ ÙØØÙØ ØÙØ ÙÙ ÙÙ ÙØÙÙØ ØÙÚÙ ØØ ØØØÙÙ ØÙØÙ ØØØ ØØ ÙÙâÚÙØÙØ:
 </p>
-<pre>
-ÙÙ 141.201.27.48:443 4352e58420e68f5e40bf7c74faddccd9d1349413
+<pre><samp>
+bridge 141.201.27.48:443 4352e58420e68f5e40bf7c74faddccd9d1349413
+</samp>
 </pre>
 
 <p>
-ØÙØØØ ØØØØÛ ØØØÙØÙ ØØ ÙÙ ØÙÙÛ ÙØØÙ ÙÙØØ ØÙØ ÙÙÚÙ ØØØ ÙÙÙØ ØØØØ. ØØ ØÙØØ ØÙØÙÙ ÙÛ ØÙØÙÙØ ØØ ØÙÙ ÙØØÙÙ ØÚØØÙØ.<br /> ØØØ ØÙÙ ØØØØ IP: <tt>'141.201.27.48'</tt><br /> ØØØ ØÙÙ ØØÚØÙ ØØØ: <tt>'443'</tt><br /> ØØØ ØÙÙØ ØØØ ØÙÚØØØ ØØØÙØØÛ ØØØ: <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt><br />
-
+ØØÙØØÙ ØØØØØ ÙÙ ÙÙ ØØÙØÙ ÙØØÙ ÙÙØØØ ÙÙÙ ÙÙÙÙ ØØØ ÙÙÙØ ØØØØ. ØÚØ ÙÙâØÙØÙÙØØ
+ÙÙâØÙØÙÙØ ØØ ØÙÙ ÙØÙØ ØØÙÙØØ ÙÙÙØ. </br> ØÙÙÙÙ ÙØÙØØ ØØØØ ØÙ ÙÙ ØØØ: <span
+dir="ltr"><tt>'141.201.27.48'</tt></span></br> ØÙÙÙÙ ÙØÙØØ ØÙØØÙ ÙÙØØ ØØØ:
+<span dir="ltr"><tt>'443'</tt></br> Ù ØÙÙÙÙ ÙØÙØØ ØØØ ØÙÚØØ ØØØ ÙÙ ØÙØØØØÙ
+ØØØ: <span
+dir="ltr"><tt>'4352e58420e68f5e40b7fc74faddccd9d1349413'</tt></br>
 </p>
 
 <a id="UsingBridges"></a>
-<h2><a class="anchor" href="#UsingBridges">ØØØÙØØÙ ØØ ÙÙ ÙØ ØØ Tor Ù Vidalia</a></h2>
+<h2><a class="anchor" href="#UsingBridges">ØØØÙØØÙ ØØ ÙÙâÙØ ØØ ØÙØ Ù ÙÙØØÙÙØ</a></h2>
 <hr />
 
 <p>
-ØØØÛ ØØØÙØØÙ ØØ ØØØØ ÙØØÙ ØØÙØØ ØÙ ØÙØÙ ØÙØÙÙØØ ØØÚÙ Vidalia ØÙØÙØ Ù ØØ ØÙÛ "ISP ÙÙ ØØØØÙØØ ØÙ ØØÚÙ Tor ØØ ÙØØÙØ ÙÛ ÚÙØ".  ÙØ ØØØ ÙÚ ØØØØ ÙÙ ØØ ØØ ØÙØØÙ ØÙ ØØ ÙÙØØÙ "ØÙØÙØÙ ÙÙ" Ù ØÙØ ØØ ÚÙÙÚ ØØ ØÙÛ ØÙØÙØ "+"Ø ØØ ØÙØÙ ØÙØÙÙØØ ØØÚÙ Vidalia ØØØÙÙ ÚÙÙØ.  ØØÙÙØ ÙØÙÙ ØÙØÙØÙ ÙÙ ØØ ØÙØ ØÙØÙ ØØØ:
+ØØØÙ ØØØÙØØÙ ØØ ÙÙÙ ÙÙ ØØ ØØÙØ ÙØØÙ ØØÙ ØØØ ØÙ ØÙØÙ ØÙØÙÙØØ ØØÙÙ ÙÙØØÙÙØ
+ØØÙÙØ Ù ØÙÙ "ØØÙÙØ ØÙÙØÙ ØÙÙØØÙØ ÙÙ ØØØØØØ ØØ ØØÙÙ ØÙØ ØØ ÙØØÙØ ÙØØÙ ØØØ"
+ÙÙÙÙ ÙÙÙØ.  ØØ ÙØ ÙØØÙ ÙÙâØÙØÙÙØ ÙÙ ØØØØ ØØ ÙÙ ÙÙØØÙØØ ØØ ØØ ØÙØÙ ØÙØÙÙØØ
+ØØÙÙ ÙÙØØÙÙØ ØØ ÙÙÙ ÙØØÙ ØÙ ØØ ÙÙØØÙ "ØØØÙÙ ÙØØÙ ÙÙ ÙÙ" Ù ØÙØ ÙÙÙÙ ÙØØÙ ØÙÙ
+ØÙØÙØ "+" ØØØÙÙ ÙÙÙØ. ØØØÙÙ ÙØØÙ ÙÙ ÙÙ ØØ ØØÙÙØ ØÙØ ÙØØÙ ØØØÙ ØØÙ ØØØ:
 </p>
 
-<br /><br /> <img src="$(IMGROOT)/vidalia-bridges.png" alt="ØÙØÙ ØÙØÙÙØØ ØØÚÙ Vidalia" /> <br /><br />
+<br /><br /> <img src="$(IMGROOT)/vidalia-bridges.png" alt="Vidalia's
+Network settings page" /> <br /><br />
 
 <p>
-ÙØ ØØØØØ ØØØØ ÙÙÛ ÚÙ ØØÙØÙÙØ ÙÛ ØÙØÙÙØ ØØØÙÙ ÚÙÙØØ ØÙØØ ÙÙ ÙØÛ ØÙØØØ ÙØØÙÙØ ØØØÙØØ ØØ ØÙØØÙØ ÙÛ ØÙØ. ØØØÛ ØØØØØÛ ØÙ ØØÚÙ Tor ÙÚ ÙÙ ÚØÙÛ ØØØØ ØÙØ ØÚØ ÙÙØ ÙÚ ÙÙ ØØØØÙ ØØØÙØ Ù ØÙ ØØ ÚØØ ØÙÙØØØ ØØØØØØ ØÙØ ØØ ØØÚÙ Tor ÙØØ ÙÛ ØÙØ.
+ØÙØ ÙÙØØ ØÙØÙÙØ ØØØØ ØØ ØØØØÙØÙ ÙØØØØÙ ØØ ÙÙâÙØÙÙ ÙÙ ÙÙâØÙØÙÙØ ØØ ØØØÙÙ ÙÙÙØ
+ÚÙÙ ÙÙâÙØÙ ØÙØØØØ ØØØØ ØÙØØÙØ ØØÙÙÙØÙ ØÙØÙÙØ ØØ. ÙØÙØ ÙÙ ÙÙ ØÙ ØÙÙØÙÙØ ØØØÙ
+ØØØØØÙ ØÙ ØØÙÙ ØÙØ ÙÙØÙØ ÙÙâÙÙØ ÙÙÙ ØÚØ ØÙØ ØÙÙØ ÙÙ ÙÙ ØØØØÙ ØØØÙØ Ù ØÙ ÙÙ
+ØØ ØÙÙ ØØÙØØ ØØØØØØØØÙ ØØ ØØÙÙ ØØ ØØ ØØØ ØÙØÙÙØ ØØØ.
 </p>
 
 <a id="FindingMore"></a>
-<h2><a class="anchor" href="#FindingMore">ÙØÙØÙ ÙÙ ÙØÛ ØÙÚØ ØØØÛ Tor</a></h2>
+<h2><a class="anchor" href="#FindingMore">ÙØÙØÙ ÙÙâÙØÙ ØÙØØØÙ ØØØÙ ØÙØ</a></h2>
 <hr />
 
 <p>
-ØØÙ ØÙÚØÛ ØØØÛ ÙØÙØÙ ØØØØ ÙØÛ ÙÙ ØÙÙÙÙØ ØØØØÙ ØÙÙÙÙ ØÙ bridges@xxxxxxxxxxxxxx ØØØ ØØ ØØ "ØØØÙØØÛ ØÙ ÙÙ ÙØ" ØÙØØ ØÙØØ ØØ ÙØÙ ÙØÙÙ. ÙÙÚÙ ØØØ ÙØØÙ ØØØØ ØÙÙ ØØØÙØØØ ØØ ØØ ÙÚ ØØØØØØ gmail ÙØ yahoo ØÙØØØÙØØ ØØ ØÙØ ØÙÙ ØÙØØ ØØØÛ ÙÚ ÙÙØØÙ ØØÙØØ ØØØØ ØÙØÙØ ØÙØ ÚÙ ØØØØ ÙØÛ ØÙÙÙÙ ØÙØØÛ ØÙØØØ ÚÙØ Ù ÙÙÙ ØØÙØØØØ ÙÙ ÙØ ØØ ØØØØ ØÙØØ. ØÙÙÛ ØØÙØØ ÙÚ ÙØØØ ØØÙØÙØ ØÙØÙÙØ ÚØØ ÚÙ ØØÙÛ ÙÙØØØ ØÙØ ØØØ:
-
+ØØÙ ØÙÚØÙ ÙÙ ØØØÙ ÙØÙØÙ ØØØØ ÙÙâÙØÙ ØÙÙÙÙ ÙØÙØ ØØØØØ ØØØØÙ ØÙÙÙÙ ØÙ ØØØØ
+</span dir="ltr">bridges@xxxxxxxxxxxxxx</span> ØÙ ÙÙØØÙ ØÙØÙØÙ ØØØØØ </span
+dir="ltr">"get bridges"</span> ØØ ÙØÙ ØÙÙÙÙ ØØØ. ÙØØÙ ØØØ ØÙÙ ØÙÙÙÙ ØØ ØØ ÙÙ
+ØÙØÙØ ØÙ ÙÙÙ ØÙØØØÙØ &mdash; ØÙØØ ØØ ØÙØ ØÙÙØÙØØØ ØØØØ ØÙØÙÙÙ ØØ ØØ ÙÙ ÙÙØ
+ØØ ØØØØÙ ØØØØØ ØÙØØÙ ØØØØ ØÙÙÙÙØ ØØÙØÙØ ØÙÙÙ ØØÙØ ØÙ ØØÙØØØØ ØÙØÙÙ ÙÙâÙØ ØØØ
+ÙÙØØ ÙÙØ.  ØØØ ØØ ØØØØÙ ØÙÙÙÙØ ÙØØØÙ ØÙ ØÙÙ ÙØÙÙÙ ØØÙØÙØ ØÙØÙÙØ ÙØØ:
 </p>
 <pre>
-ØÙØØÚØÙ ÙØÛ ÙØØØÙ ÙÙ ØÙØ ØÙÙØØØØ:
+Here are your bridge relays:
 
- bridge 60.16.182.53:9001 c9111bd74a710c0d25dda6b35e181f1aa7911133
- bridge 87.237.118.139:444 c18dde4804e8fcb48464341ca1375eb130453a39
- bridge 60.63.97.221:443 ab5c849ed5896d53052e43966ee9aba2ff92fb82
+bridge 60.16.182.53:9001 c9111bd74a710c0d25dda6b35e181f1aa7911133
+bridge 87.237.118.139:444 c18dde4804e8fcb48464341ca1375eb130453a39
+bridge 60.63.97.221:443 ab5c849ed5896d53052e43966ee9aba2ff92fb82
 
 </pre>
 <p>
-ØÙ ÙØØ ØØÙØÙØ ØÙÙÙÙ ØØÙÛ ØØÙØØØØ ÙÙØ ÙÛ ØÙØÙÙØ ÙØØØÙ ÙÙÚØØÙØÛ Vidalia ØØ ØØØÙÙ ØÙÙØ ÚÙ ØÙ ØÙØ ØØÙØÙ ØØ <a href="#UsingBridges">ØØÙØ</a> ØÙØÙ ØØØ.
+ÙÙÚØÙÙâÙÙ ØÙÙÙÙ ØØÙÙ ØØÙØØØØ ÙÙâÙØ ØØ ØØÙØÙØ ÙØØÙØØ ÙÙâØÙØÙÙØ ØÙ ÙØØØÙ ØÙØÙÙ
+ÙØØÙ ÙÙØØÙÙØ ÙÙ <a href="#UsingBridges">ØØÙØØØ</a> ØÙ ØÙØØ ØÙØØÙ ØÙ ØÙ
+ÙØØØØØÙÙØ ÙØØØØÙ ÙÙÙØ.
 </p>
 
-  </div><!-- #main -->
+<a id="RunningABridge"></a>
+<h2><a class="anchor" href="#RunningABridge">ØØØØÙ ÙØØÙ ÙÙ ÙÙ ØÙØ</a></h2>
+<hr />
 
+<p>
+ØÚØ ÙÙâØÙØÙÙØ ÙÙÙ ÙÙÙØ Ù ÙÙÙâØÙØÙÙØ ÙÙ <a href="<page
+docs/tor-doc-relay>">ØÙÙ ÙØÙÙÙÙ ØÙØ</a> ØØ ØØØØ ÙÙÙØØ ÙØØÙ ØØØ ÙÙ ØÙÙ ÙÙ ØØ
+ØØØØ ÙÙÙØ. ØÙØ ÙÙâØÙØÙÙØ ØÙØØ ØØ ØÙÙ ØØÙ ØÙØÙÙ ÙÙÙØ:
+<ul>
+<li> manually <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>edit
+your torrc file</a> to be just these four lines:<br />
+<pre><code>
+SocksPort 0
+ORPort 443
+BridgeRelay 1
+Exitpolicy reject *:*
+</code></pre></li>
+<li>ÙØ <a href="<page docs/tor-doc-relay>">ØØ ØØØÙØØÙ ØØ ÙÙØØÙÙØ</a>:<br /> <img
+src="$(IMGROOT)/vidalia-bridges-setup.png" alt="Vidalia's Sharing settings
+page" /></li>
+</ul>
+</p>
+
+<p>If you get "Could not bind to 0.0.0.0:443: Permission denied" errors on
+startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>some
+complex port forwarding</a>.
+</p>
+
+<p>
+ÙÙÚØÙÙâÙÙ ÙÙ ÙÙ ØØ ØÙØÙÙ ÙØØÙØØ ØØÙØ ØÙØ ØØ ØØÙÙ ØÙÙÙÙ ØÙØ <b>ÙÙØÙØ ØØØÙ
+ÙØÙØÙØ ØØ</b>
+</p>
+
+<p>
+ØÙÙ ÙÙ ØÙØ ØÙ ØÙØØ ØØÙÙØØÙÙ ØØØØ ØØØØØØÙ ØØ ØØ ÙÙ ØØÙÙ ØØ ÙÙ ØØ ØØØÙØØÙ ØØ
+ÙØ ØØÙØ ÙØ ØÙÙÙÙ ØØØØÙ ØØÙ ØØ ÙÙÙ ØÙ ØÙØ ØØØÙ ØØÙ ØÙØØ ÙÙØØØ ÙÙâÙÙØ. ØÙØ
+ÙÙâØÙØÙÙØ ÙØØÙÙÙØÙ ØÙ ÙÙ ÙØØØØ ØÚÙÙÙØ ØØ ØÚØ ØØ ÙÙØØÙÙØ ØØØÙØØÙ ÙÙâÙÙØØ ØØ
+ÙÙÙ ÙØØÙ ØØØØ ÙÙ ÙÙØÙØ ØØ ÙÙØØÙ ØÙØÙÙØØ ØØÙØÙÙ ØØ ØÙÙ ÙØØ ØØ ØÙØØÙ ØÙØ. ØÚØ
+ØØ ÙÙÙÙÙØ ÙØ ØÙ ØØ ØÙ ØØØÙØØÙ ÙÙâÙÙÙØØ ÙÙâØÙØÙÙØ ØØØØ ÙÙ ØØ ØÙ ØÙØØ ØØØÙ ØØ
+ØØØÙØØÙ ØØ <a href="#Understanding">ÙØÙØ ÙÙÙ</a> ØÙØØØ ÙÙÙØ.(ØÙØ ÙÙâØÙØÙÙØ
+ØØØ ØÙÚØØ ØØ ØØ ÙØÚ ÙØÙÙâÙØÙ ØÙØ ÙÙØØ ÙÙÙØ ÙØ ØÙ ØØ ØØ ØØØØ <span
+dir="ltr"><tt>/var/lib/tor/fingerprint</tt> ØØ ØØØØ ÙÙØ ÙÙØÙØÙ ØÙØØÙ ØØÙÙ
+ØÙØ ÙÙØØ ÙÙÙØ).
+</p>
+
+<p>
+ØÚØ ÙØÙÙ ÙØØÙØ ÙÙ ØÙØØØ ØØ ØØÙØ ØØØØÙ ÙÙ ØÙ ØÙØØ ØÙÙÙÙÙ ØØØÙÙØØ ÙØÙØÙ <a
+href="<gitblob>doc/spec/bridges-spec.txt">ÙØØØØØ ÙÙâÙØÙ ØÙØ</a> ØØ ÙØØÙØÙ
+ÙÙØÙÙØ. ÙÙÚÙÙÙ ØÚØ ØÙØÙÙ ØØØÙØ ÙÙ ØØ ÙÙâÙØÙ ÙÙØØØ ÙØØÙ ÙØ ØÙØ ØØØØÙØØØØ
+ØØØÙØØÙ ÙÙÙØ ÙÙØ ØÙ ÙÙØÙ ÙØØØØØ ØØ ØØØØ ÙÙÙ ÙØØØØÙ ÙÙÙØ.
+</p>
+
+  </div>
+
+
+
 #include <foot.wmi>

Modified: website/trunk/fa/download.wml
===================================================================
--- website/trunk/fa/download.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fa/download.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -1,307 +1,428 @@
+
+
+
+
+
+
 ## translation metadata
-# Based-On-Revision: 16278
-# Last-Translator: foo
+# Revision: $Revision$
+# Translation-Priority: 1-high
+#include "head.wmi" TITLE="Tor: Download" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
+<div class="main-column">
 
-#include "head.wmi" STYLESHEET="stylesheet-rtl.css" TITLE="Tor: Download" CHARSET="UTF-8"
+<h2>ØØØÙâÙØÙ ÙÙØÙØ ØÙØ</h2>
 
-<div class="main-column" lang="fa">
+<div class="warning">
 
-<h2>ØØØÙ ÙØÛ ÙØÙ ØÙØØØÛ Tor ÙÙØÙØ</h2>
+ÙØØØØ: ÙÙâØÙØÙÙØ ØÙØ ÙØÙØØÙ ÙØØ ÙÙØØ... ÙØ ÙØÙØÙ ÙÙØ ØÙØØ ÙØØ ÙÙÙÙØ Ù
+ØØÙÙØ. ÙØØÙ ØØØ ØØØÙ ØØ ØØØØÙØÙØØÙ ØØ ØØÙÙØ ØÙÙØ Ù ÙØÙ ØÙØØØØØÙ ØØ ÙØØØØÙ
+ØÙØÙÙ ÙÙÙØ! ØÙØ ØÙ ØÙÙØÙÙ ØÙ ÚÙØÙ ÙÙØØ ÙÙ ØÙØ ØØØÙ ÚÙÙØÙ ÙØÙØÙ ØÙ ØÙ ØØØÙØØ
+ØØØÙØ.   ÙØÙØÙ ØÙØÙÙ ØØ ØØØÙ ØÙØÙØÙ <a href="#Warning">ÙØØØØ</a> ØØØØØØ ØÙÙØ
+ØØ ØØ ÙØÙÙØØ Ù ÙØØÙØÙØÙØÙ ØÙØ ØØÙØ ØÙÙØ.
+</div>
 
-<hr />
+<div class="underline"></div>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="3">
+<table cellpadding="6" cellspacing="1" border="0" width="100%">
 <thead>
-<tr bgcolor="#e5e5e5">
-<th>ÙØÙÚØÙ</th>
-<th>ØØØÚÙØÛ ÙØØÙ ØØØØ</th>
-<th>ØØØÚÙØÛ ÙØØÙ ÙØÙØÙØØØ</th>
-<th>ØØÙÙÙØ</th>
+<tr bgcolor="#009933" style="color: white; ">
+<th>ØÙØØÙ ØØÙÙ</th>
+<th>ØØØÚØØØÙ ÙØÙØØØ</th>
+<th>ØØØÚØØØÙ ÙØÙØÙØØØ</th>
+<th>ÙØØ Ù ØÙØÙÙØØ</th>
 </tr>
 </thead>
 
 <tr>
   <td>
-
-    ÙÙÙØÙØ<br /> <small>ÙÙØØØØ XPØ 2000Ø ØØÙØ 2003Ø ÙÙÙÙÙÙÙÙØ 98SE</small>
+    <img src="images/distros/windows.png" /> Windows<br /> <small><em>Windows 7,
+Vista, XP, 2000, 2003 Server</em></small>
   </td>
   <td>
-    <a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a>(<a href="<package-win32-bundle-stable-sig>">sig</a>)
+    <a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a>
+(<a href="<package-win32-bundle-stable-sig>">sig</a>)
   </td>
   <td>
-    <a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a>(<a href="<package-win32-bundle-alpha-sig>">sig</a>) 
+    <a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a> (<a
+href="<package-win32-bundle-alpha-sig>">sig</a>)
   </td>
-
   <td>
-    <a href="<page docs/tor-doc-windows>">ØØÙÙÙØÛ ÙØØ Ù ÙÙÚØØÙØÙ</a>
+    <a href="<page docs/tor-doc-windows>">ÙÙÙØÙØ</a>
   </td>
 </tr>
 
 <tr bgcolor="#e5e5e5">
   <td>
-    ØÙØØÙ ØÙØÙÙÙ<br /> <small>ØÙØÙÛ ÙÚÙÙØØØ (OSX 10.4 Ù 10.5)</small>
+    <img src="images/distros/windows.png" />ØØØÙ ÙØÙØÚØ ØÙØ ØØØÙ ÙÙÙØÙØ </br>
+(ØØÙÙ ØÙØØ ÙÙØØÙÙØØ ØÙØØØØÙÙØ ÙÙÙÙÙÙ Ù ÙØÙØÙØÙØ)
+  </td>
+  <td>
 
+
+    # Translators should link to the Browser Bundle for their language,
+# e.g. _ru.exe Russian, _de.exe for Deutsch, etc.
+<a
+href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe"><version-torbrowser-tor></a>
+(<a
+href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)
+  </td>  
+  <td>
   </td>
   <td>
-    <a href="<package-osx-bundle-stable>"><version-osx-bundle-stable></a>(<a href="<package-osx-bundle-stable-sig>">sig</a>)
+    <a href="<page torbrowser/index>">ØØØÙ ÙØÙØÚØ ÙÙÙØÙØ</a>
   </td>
+</tr>
+
+<tr>
   <td>
-    <a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha></a>(<a href="<package-osx-bundle-alpha-sig>">sig</a>) 
+    <img src="images/distros/windows.png" />ØØØÙ ÙØÙØÚØ ÙØÙØØ ØÙØ ØØØÙ ÙÙÙØÙØ
+</br> (ØØÙÙ ØÙØØ ÙÙØØÙÙØØ ØÙØØØØÙÙØ ÙÙÙÙÙÙØ ÙØÙØÙØÙØ Ù ÙÙØÙÙ)
   </td>
+  <td>
 
+
+    # Translators should link to the IM Browser Bundle for their language,
+# e.g. _ru.exe Russian, _de.exe for Deutsch, etc.
+<a
+href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_fa.exe"><version-torbrowser-tor></a>
+(<a
+href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_fa.exe.asc">sig</a>)
+  </td>
   <td>
-    <a href="<page docs/tor-doc-osx>">ØØÙÙÙØÛ ÙØØ Ù ÙÙÚØØÙØÙ</a>
   </td>
+  <td>
+    <a href="<page torbrowser/index>">ØØØÙ ÙØÙØÚØ ÙØÙØØ ÙÙÙØÙØ</a>
+  </td>
 </tr>
 
-<tr>
+<tr bgcolor="#e5e5e5">
   <td>
-    <br /> <small>ÙÙØ PowerPC ÙÚÙÙØØØ (OSX 10.3)</small>
+    <img src="images/distros/apple.png" />ÙÙÙÙØØØ</br><small>ÙÙØ ØØØÙ ÙØØØØÙØÙ
+ØÙÙØÙ</em></small>
   </td>
-
   <td>
-    <a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable></a>(<a href="<package-oldosx-bundle-stable-sig>">sig</a>)
+    <a href="<package-osx-bundle-stable>"><version-osx-bundle-stable></a> (<a
+href="<package-osx-bundle-stable-sig>">sig</a>)
   </td>
   <td>
-    <a href="<package-oldosx-bundle-alpha>"><version-oldosx-bundle-alpha></a>(<a href="<package-oldosx-bundle-alpha-sig>">sig</a>) 
+    a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha></a> (<a
+href="<package-osx-bundle-alpha-sig>">sig</a>)
   </td>
+  <td>
+    <a href="<page docs/tor-doc-osx>">ØÙØØÙ ØØÙÙ ÙÙÙÙØØØ</a>
+  </td>
+</tr>
 
+<tr>
   <td>
-    <a href="<page docs/tor-doc-osx>">ØØÙÙÙØÛ ÙØØ Ù ÙÙÚØØÙØÙ</a>
+   <img src="images/distros/apple.png" />ÙÙÙÙØØØ</br><small><em>ÙÙØ ØØØÙ ÙØÙØ
+ÙÙâØÙ</em></small>
   </td>
+  <td>
+    <a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable></a>
+(<a href="<package-oldosx-bundle-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<package-oldosx-bundle-alpha>"><version-oldosx-bundle-alpha></a>
+(<a href="<package-oldosx-bundle-alpha-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-osx>">ØÙØØÙ ØØÙÙ ÙÙÙÙØØØ</a>
+  </td>
 </tr>
 
 <tr bgcolor="#e5e5e5">
   <td>
-    ØØØÙ ÙØÛ ÙÙÙÙÚØ/ÙÙÙÙÚØ<br /> <small>Redhat/CentOSØ FedoraØ DebianØ UbuntuØ SUSE</small>
-
+    <img src="images/distros/generic.png" />ØØØÙâÙØÙ ÙÙÙÙÙØ/ÙÙÙÙÙØ
+</br><small><em>ØØâÙØ/ØÙØ ØÙâ ØØØ ÙØÙØØØ ØØÙØÙØ ØØÙÙØÙØ ØÙØÙ</em></small>
   </td>
   <td colspan="2">
-    <a href="<page download-unix>">ØÙØÙ ØØØÚÙØÛ ÙÙÙÙÚØ/ÙÙÙÙÚØ</a>
+    <a href="<page download-unix>">ØÙØÙ ØØØÚØØØÙ ÙÙÙÙÙØ/ÙÙÙÙÙØ</a>
   </td>
   <td>
-    <a href="<page docs/tor-doc-unix>">ØØÙÙÙØÛ ÙØØ Ù ÙÙÚØØÙØÙ</a>
+    <a href="<page docs/tor-doc-unix>">ÙÙÙÙÙØ/ØÙâØØâØÙ/ÙÙÙÙÙØ</a>
   </td>
 </tr>
-
 </table>
 
-<br />
+<div class="underline"></div>
+<div class="nb">
+<a id="packagediff"></a>
+<h2><a class="anchor" href="#packagediff">ØÙØÙØÙØÙ ÙÙØÙ ÙØÙØØØ &amp; ÙØÙØÙØØØ
+ÚÙØØØ</a></h2>
 
 <p>
-<a href="#packagediff">ÙØÙ ØÙÙ ÙØØÙ ÙØÙØØØ Ù ÙØÙØÙØØØ</a>ÚÙØØØ
+ØØØÙâÙØÙ ÙØÙØØØØ ÙÙÚØÙÙ ÙÙ ÙØ ÙØÙØÙ ØØØÙÙ ÙØØØØØ Ù ÙØÙØÙ ØÙÙØ ØØ ØÙ ÚÙØÙÙ
+ÙØÙ ØØÙÙØ ÙØÙØÙÙØ ÙØØØ ÙÙØØØ ÙÙâØÙÙØ.
 </p>
-
 <p>
-Tor ØÙ ØÙÙØÙ ÙÚ <a href="http://www.fsf.org/";>ÙØÙ ØÙØØØ ØØÙÚØÙ</a> ØØØ <a href="<gitblob>LICENSE">ÙÙØØÙØ 3-clause BSD </a> ÙÙØØØ ØØÙ ØØØ. ØØØÙ ÙØÙ ØÙØØØÛ ÙÙÚÙÙÙ ØØÙÛ <a href="<page vidalia/index>">Vidalia</a> Ù <a href="http://www.privoxy.org/";>Privoxy</a> ØØØ ÚÙ ØØÙØÙÙ ÙØÛ ÙØØÙØØÙ ÙÙØØØ ØØÙ ØØØ GNU GPL ÙÛ ØØØÙØ.
-
+ØØØÙâÙØÙ ÙØÙØÙØØØÙ ÙÙ ÙÙØØØ ÙÙâØÙÙØØ ØÙØ ÙÙÙ ÙØØÙ ØÙØ ØÙ ÙØØØ ØØ ØÙÙØÙØØ
+ØØÙØ ØÙÙØ ØØ ØØØ ÙÙÙØ ØØ ØØÚÙØÙ ØÙÙØ ØØØØÙ ØÙØ. ÙÙÚÙÙÙ ØÙÙØÙÙ ÙÙ ØØØØÙ ØÙØØÙ
+ÙÚØØØ ØØÙØØØÙ ÙØØØ ØÙ ØØØÙâÙØÙ ÙØÙØØØ ÙØØÙØØ ØØ ØØÙØ ØÙØØØÙ ÙØØØ ØØÚÙØÙ
+ÙØØÙØ ØÙ ØØØÙØØ Ù ØÙÙÙØ ØØ ØØØÚØØØÙâÙØ ØØØÙØØØØ ÙØØÙØ.  ÙØÙØÙ ØÙØØØÙ ØØ ØØØÙ
+<a href="https://bugs.torproject.org/";>ÚØØØØ ØØÚÙØ</a> ØÙØØÙ ÙÙÙØ.
 </p>
+</div>
 
+<div class="underline"></div>
+<div class="nb">
 <p>
-ÙØØ Tor Ù ØØØÙØØÙ ØØ ØØÚÙ Tor ÙÙÚ ÚÙÙÙ ÙØÙÙÙ ØÛ ÙØØØØØ ØÙØ ØÚØ ÙÛ ØÙØÙÙØ Tor ØØÙØØØ ÙØØÙ ØØØÙØØÙ ØØ ØÙØØ ÙØÙØÙ <a href="<page donate>">ÙÚ ÙØÙÙ ÙØØÙ ÚØØ ØØ ÙØÙÙØØ ØÙ ÙØÙÚÙ Tor</a> ØØ ÙØØ ØØØØÙ ØØØÙØ.
+ØÙØ ØØÙÙØÙ ÙÙ <a href="http://www.fsf.org/";>ÙØÙ ØÙØØØ ÙØØÙÙ</a> ØØØ ÙÙØØÙØ
+<a href="<gitblob>LICENSE">ØÙ ØØØ ØÙâØØâØÙ</a> ØÙÙÙØ ØØÙ ØØØ. ÙÙÚÙÙÙ ØØØÙâÙØ
+ØØÙÙ a href="<page vidalia/index>">ÙÙØØÙÙØ</a> Ù <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/";>ÙÙÙÙÙÙ</a> ÙØØÙØ ÙÙ
+ÙØÙ ØÙØØØÙØÙ ØÙÙÙØ ØØÙ ØØØ ÙÙØØÙØ ÚÙÙ ØÙâÙÙâØÙ ØØ ØÙØÙØ ÙÙâÙÙÙØ.
 </p>
+<p>
+ÙØÙÙÙâØÙ ØØØÙ ÙØØ ØÙØ ÙØ ØØØÙØØÙ ØØ ØØÙÙ ØÙØ ØØÙØÙØ ÙÙÙâØÙØØ ÙÙÙ ØÚØ ØÙØÙÙ
+ØØØÙØ ÙÙ ØØÙØØØ Ù ØÙØØØ ÙÙØØ ØØØÙØØÙ ÙØØØ ØÚÙØØØ ÙØÙØÙ ÙÚØÙÙ ØÙ <a
+href="<page donate>">ØÙØØØ ÙØØÙ ÙØÙÙØØ ØØØÙ ÙØÙÚÙ ØÙØ </a> ØÙÙØØØÙØ.
+</p>
+</div>
 
+<div class="underline"></div>
+<div class="nb">
 <p>
-ØØØÛ ØØÙØØ ØØ ÙØØÙØÙ ÙØÛ ØÙÙÙØÛ Ù ÙØØÙÙØØ ÙØÙØØØ ØØÙØØ ØØ <a href="http://archives.seul.org/or/announce/";>ØØÙØÙ ÙÙØØ ØÙÙÙÙ</a> (ØØ ØØÙÙ ØÙÙÙÙ ØØ ØÙØ ØÙØØØÙ ØÙØÙØ ØØ ÚÙ ØØÙÙØ ÚÙÙØ). ÙÙÚÙÙÙ ÙÛ ØÙØÙÙØ <a href="http://rss.gmane.org/gmane.network.onion-routing.announce";>ÙÙØØ ÙØÛ ÙÙØØØ ØØØÛ RSS ØØ ÙØØÙØÙ ÚÙÙØ</a>.
+ØØØÙ ØÚØÙÙ ØØ ÙØØÙØÙâÙØÙ ØÙÙÙØÙ Ù ÙØØÙâÙØÙ ÙØÙØØØ ØØÙØØØØ ØØ ÙÙØØ ØÙÙÙÙâÙØÙ
+ÙØ ØØ <a href="http://archives.seul.org/or/announce/";>ØÙÙØØ</a> ØØØ ÙØÙ
+ÙÙÙØ. (ÙÙÙÙ ØØØ ØØØÙ ØØØ ØØÙÙØÙÙ ØØØÙØØÙ ØÙÙÙÙ ØØØØÙ ØÙØ). ÙÙÚÙÙÙ ÙÙâØÙØÙÙØ
+ØØØÙ ØØØÙØØÙ ØØ ÙÙØÙØÙ ØØâØØâØØ <a
+href="http://rss.gmane.org/gmane.network.onion-routing.announce";>ØÙÙØØ</a>
+ØØ ØØÙÙÙØ.
 </p>
 
-<link rel="alternate" title="ØØØØÙ Tor ÙØ ØØÙØÙ" href="http://rss.gmane.org/gmane.network.onion-routing.announce"; type="application/rss+xml" />
+<link rel="alternate" title="ØØÙØÙÙÙ ØÙâØØ ÙØÙÚÙ ØÙØ" href="http://rss.gmane.org/gmane.network.onion-routing.announce"; type="application/rss+xml" />
 
 <form action="http://freehaven.net/cgi-bin/majordomo.cgi";>
-<input type="hidden" name="mlist" value="ÙØ ØØÙØÙ">
-<input type="hidden" name="subscribe" value="1">
-<input type="hidden" name="host" value="freehaven.net">
-<input name="email" size="15">
-<input type="submit" value="ØØØØØÚ ÙØ ØØÙØÙ">
+<input type="hidden" name="mlist" value="or-announce"/> <input type="hidden"
+name="subscribe" value="1"/> <input type="hidden" name="host"
+value="freehaven.net"/> <input name="email" size="15"/> <input type="submit"
+value="subscribe to or-announce"/>
 </form>
+</div>
 
-<br />
-
+<div class="underline"></div>
+<div class="warning">
 <a id="Warning"></a>
-<h2><a class="anchor" href="#Warning">ØØØØØ: ØÙØ ÙÛ ØÙØÙÙØ Tor ÙØÙØØÙ ÚØØ ÚÙØØ</a></h2>
+<h2><a class="anchor" href="#Warning">ÙØØØØ: ØÙØ ÙÙâØÙØÙÙØ ØÙØ ÙØÙØØÙ ÙØØ
+ÙÙØØ</a></h2>
 
 <p>
-...ÙØ ÙØÙØÙ ÙÙØ ØÙ ØØ ÙØØ ÙÚÙÙØ Ù ØÙ ØØÙ ØÙØ ØÙØ ÚÙÙØ.  ØØÙØ ØØØÛ ØØ ØÙØ ÙØÛ ØÙØ ØØ ØØÙÙØ ØÙÙØ Ù ÙØÙ ØÙØØØ ØÙØ ØØ ØÙØØØÙ ÙÙÚØØÙØÛ ÚÙÙØ! Tor ØÙ ØÙÙØÙÛ ÙÙÙ ÙÙØØÙØÛ ØÙØ ØÙØ ØÙØ ÚÙÙØÙÛ ØØ ØØÙÙÙ ÙÙÛ ÚÙØ. ØØÙØ ÙØØÙØ ÚÙØÙÙ ØØØ ÙÙÙ ØØØÙØ:
+... ÙØ ÙØÙØÙ ÙÙØ ØÙØØ ÙØØ ÙÙÙÙØ Ù ØØÙÙØ.  ÙØØÙ ØØØ ØØØÙ ØØ ØØØØÙØÙØØÙ ØØ
+ØØÙÙØ ØØÙÙØ Ù ÙØÙ ØÙØØØØØÙ ØØ ÙØØØØÙ ØÙØÙÙ ÙÙÙØ! ØÙØ ØÙ ØÙÙØÙÙ ØÙ ÚÙØÙ ÙÙ
+ØØØÙ ÙØÙÙ ÙÚÙâØØØØÙ ØÙØ ØØØÙØØ ØØØÙØØ <em>ÙÙØØ</em> .  ÚÙØÙÙ ÙØÙÙ ØØØÚ ÙÙ
+ÙÙâØÙØÙ ØÙ ØÙÙØ ØØØØÙ ÙØØ ØØØØØÙØ ØØ:
 </p>
 
 <ol>
 <li>
-Tor ÙÙØ ØØ ØØÙØÙÙ ÙØÛ ØÙÙØØÙØÛ ÚÙ ØÙØ ØØØØÙ ØØØÙÙÚ ØÙØ ØØ ØØÙÙ Tor ÙÙÚØØÙØÛ ÙÛ ØÙÙØ ØØ ÙØØÙØØ ÙÛ ÚÙØ - ÙÙØ ØÙ ØÙÙ ØÙÙÙ ÚÙ ØÙ ØØ ÙØØ ÚØØÙ ØÙØ ÙÙÙ ØØØÙÙÚ ØÙØ ØØ ØÙ ØÙØ ØØØÙÙÛ ÚÙÙØÙ ÙÙÛ ÚÙØ.  ØÙØÙÙ ÙÛ ÚÙÙÙ ØØ <a href="http://www.mozilla.org/firefox";>Firefox</a> ØØ ÙØÙÙØ <a href="https://torbutton.torproject.org/dev/";>Torbutton</a> ØØØÙØØÙ ÚÙÙØ.
+ØÙØ ÙÙØ ÙØÙ ØÙØØØÙØÙ ØÙÙØØÙØÙ ØØ ØØØ ÙÙØØ ÙØØØ ÙÙâØÙØ ÙÙ ØØØÙ ØØÙØ ØØØÙÙÙ
+ØØÙ ØØ ØÙØ ØÙØÙÙ ØØÙ ØØØÙØ. $mdash; ÙÙØ ØÙ ØÙÙ ØÙÙÙ ÙÙ ØÙâØØ ÙØØ ÙØØÙâØÙØ Ù
+ØÙ ØÙØØ ØØØÙÙÙØ ØØØÙÙÙ ØÙÙØØÙØÙ ØÙØ ØØ ÙØÙÙ ÙØÙØÙØ ÙØØ.  ÙÙØÙÙØØ ÙÙâÙÙÙÙ ØØ
+<a href="http://www.mozilla.com/en-US/firefox/all-older.html";>ÙØÙØÚØ
+ÙØÙØÙØÙØ</a> ØØ <a href="https://addons.mozilla.org/firefox/2275/";>ØÙØÙÙÙ
+ØÙØØØØÙÙ</a> ØØØÙØØÙ ÙÙÙØ.
 </li>
 
 <li>
-ÙÙØÚÙÙ ÙØÙÛ ØØ ÙØÙÙ JavaØ FlashØ ActiveXØ RealPlayerØ QuicktimeØ ÙÙØÚÙÙ Adobe's PDF Ù ØØÙØ ÙÙØÚÙÙ ÙØ ØØ ÙÛ ØÙØÙ ØØØÚØØÛ ÚØØ ØØ ØØØØ IP ØÙØ ØØ ØÙØØ ÚÙØ. ØØØÙØÙØÙ ØØÙØ <a href="http://plugindoc.mozdev.org/faqs/uninstall.html";>ÙÙØÚÙÙ ÙØÛ ØÙØ ØØ ÙØÙ ÚÙÙØ</a> (ØØØÛ ØÙÙÚÙ ØØÙÙÙØ ÚÙ ÙÙØÚÙÙ ÙØÙÛ ÙØØ ØØÙ ØØØØ ØÙ "ØØØØØÙ:ÙÙØÚÙÙ ÙØ" ØØÙÙØ) ÙØ ØØ <a href="https://addons.mozilla.org/firefox/1237/";>QuickJava</a>Ø<a href="https://addons.mozilla.org/firefox/433/";>FlashBlock</a> Ù ØÚØ ÙØÙØØÙ ØØØÙØØ ØØØÙØØ <a href="http://noscript.net/";>NoScript</a> ØØÙÙÙ ÚÙÙØ. ÙØÙÙØÙØÙÛ ÚÙ ØØÙØØØØ ØÙØØØÛ ØØØØØÙ ÙØ ØØÙØ ÙØÙÛ ÚÙ ØØ ØÙ ØØÙÙ ÙÛ ÚÙÙØ (ÙØÙÙØ ÙÙØØ ØØØØØ Google) ØØØØØ ÙÛ ØÙÙØØ ØØ ØØÙ ÚÙÙØØ ØÙØØ ØÙÙÙØ 
 ÙÙÚÙ ØØØ ÙØÙØ Tor ØØ ÙÙØØØ ÚÙÙØ Ù/ÙØ ØØÙØØØØ ØØØØ ØØ ØÙØØØØ ØÙÙØ. ØØØÛ ØÙØØØ ØØØÙØ ÙÛ ØÙÙØ ÚÙ ØØ ØÙ ÙØÙØÚØ ØØØÙØØÙ ÚÙÙØ (ÙÚÛ ØØØÛ Tor Ù ÙÚÛ ØØØÛ ÙØÙØÙØÛ ÙØØÙÙ).
+ØÙØØØØÙÙ ÙÙØÚÙÙÙØÙÙ ÙØÙÙØ ØØÙØØ ÙÙØØ ØÙØÙÙØÙÙØØ ØÙÙ ÙÙÙØØ ÙÙÙÙÙ ØØÙÙØ ÙÙØÚÙÙ
+ÙÙâØÙâØÙ ØØÙØÙ Ù ØÙÙÙ ØØ ØÙØÙØØÙ ÙÙâÙÙØ ØÙØØ ØÙÙØ ÙÙâØÙØÙÙØ ØÙâÙÙ ØØØØ ØÙØ
+ØØ ØØØÙØØÙ ÙÙÙØ. ØØÙÙØÙ ÙØØÙØ ÙÙØÙÙØ ØÙØÙØØÙ ØÙØÙØ ØÙØ. ØÚØ ÙÙâØÙØÙÙØ ÙÙØÙÙØ
+ØØ ÙØØÙ ÙÙÙØØ ÙÙâØÙØÙÙØ ØØ ÙØØØØÙ ØÙ <a href="<page
+torbutton/faq>#noflash">ØÙØÙÙ ÙØØØ ØØØÙ ÙÙØÙÙØ</a> ØØØØÙ ØØÙÙØ ØØ ÙØØÙ ØÙØØ
+ÙÙÙ ØÚØÙ ØØØÙØ ÙÙ ØÙØØØÙ ÙÙÙØÙ ØØ ØØØÙ ØÙÙÙ ØØØ ÙÙâÙÙÙØ. ÙÙÚÙÙÙ ØÙØÙÙÙâÙØÙÙ
+ÙØÙÙØ ØÙÙØØØ ÚÙÚÙØ ØØÙØØØØ ØÙØØÙ ØØ ØØØØÙ ØØ ÙØâØØÙØÙØÙÙ ÙÙ ØØ ØÙ ØØÙÙ
+ÙÙâÙÙÙØ ØÙØâØÙØÙ ÙÙâÙÙÙØ. ØÙÙØ ÙÙÙÙ ØØØ ØÙØ ØØ ØÙØ ØØÙÙØ ÙØ ØØÙØØØØ ØØØØ ØØ
+ÙÙØØØ ÙÙÙØ. ØØØÙ ØØ ÙØØÙ ØØØÙØ ÙÙâØÙÙØ ØØ ØÙ ÙØÙØÚØ ØØØÙØØÙ ÙÙÙØ (ÙÙÙ ØØØÙ
+ØÙØ ØÙ ØÙØØ ØÙÙ Ù ØÙÚØÙ ØØØÙ ÙØÙØ ÙØâØÙÙ ÙØ ØØÙØÙØ Ù ØÙÙØØÙØ)
 </li>
 
 <li>
-ØØ ÚÙÚÛ ÙØ ØØØØØ ØØØÙØ: ØÚØ ØØÙÙ Tor Ù Privoxy ÙØÙØ ÙÛ ÚÙÙØ Ù ØØÙØÛ ØÙ ØÙØ ÙÚ ÚÙÚÛ ØØÙØØ ØÙ ÚÙÚÛ ÙÛ ØÙØÙØ ØÙØ ØØ ØÙØØØÙÛ ÚÙØ ØØÛ ÙÙØÛ ØÙØØØÙ ØØÙØ ØÙ ØØØÙØØÙ ØØ Tor ÚÙÙØ. ØØÙØ ÙØØØØÙ ÚÙÚÛ ÙØÛ ØÙØ ØØ ÙØÚ ÚÙÙØ. <a href="https://addons.mozilla.org/firefox/82/";>CookieCuller</a> ØÙ ØÙØ ÚÙÚ ÙÛ ÚÙØ ÚÙÚÛ ÙØÙÛ ØØ ÚÙ ÙÛ ØÙØÙÙØ ØÙØ ÚÙÙØ.
+ØØ ÙÙÙÙâÙØ ØØØØØ ØØØÙØ: ØÚØ ØØÙ ØØÙÙ ØÙØ ÙÙ ØÙÙØØÙØ ØØ ÙØÙØ ÙÙâÙÙÙØ Ù ÙÙ
+ØØÙØ ØÙ ØÙØ ÙÙÙÙ ÙÙâØÙØØ ØÙ ÙÙÙÙ ÙÙâØÙØÙØ ØÙØ ØØ ØÙØØØÙÙ ÙÙØ ØØÙ ØÚØ ÙØØØØÙ
+ØØ ØÙØ ØØØÙØØÙ ÙÙÙØ. ØÙØØØØÙÙ ØØÙ ÙÙâÙÙØ ØØ ÙÙÙÙâÙØÙ ØÙØ ØØ ØÙ ØÙØØ ØÙÙÙ ØÙ
+ÙØØ ØØØØ. <a href="https://addons.mozilla.org/firefox/82/";>ÙÙÙÙ ÙÙÙØ </a>
+ÙÙâØÙØÙØ ÙÙÙ ÙÙØ ØØ ÙØ ÙÙÙÙ ØØ ÙÙ ÙÙÙâØÙØÙÙØ ØØØÙØØÙ ÙÙÙØØ ÙØÙÙØ ÙÙØ.
 </li>
 
 <li>
-Tor ÙØØØ ØØØÙÙÚ ØÙØ ØØ ØÛ ÙØÙ ÙÛ ÚÙØØ Ù ÙÙÙ ÚÙØÙØÛ ØØÙÙ ØØÚÙ Tor ØØ ÚØÚØØØÛ ÙÛ ÚÙØØ ØÙØ <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>ÙÙÛ ØÙØÙØ ØØØÙÙÚ ØÙØ ØØ ØÙÙ ØØÚÙ Tor Ù ÙÙØØ ÙÙØÙÛ ØÙ ÚØÚØØØÛ ÚÙØ.</a> ØÚØ ØØØØÙ ØØØØØØ ØØ ØØÙØØØØ ØØØØ ÙØØÙØØ ØØÙØ ØØØØØÙ ØÙÙØØÙØ ØØØÙØÚ ÙØÙÙÙÛ ØØ ØÙØØ ÚÙ ÙÛ ØÙØÙÙØ ØØØÙØØ ØÙ ØØØ ØÙÙØ - ØØ HTTPS ÙØ ØØÙØ ØÙØØÙ ÙØÛ ÚØÚØØØÛ Ù ØØÙÙØ ØØØØØØ ÚØÙÙ ØØØÙØØÙ ÚÙÙØ.
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network, but
+<a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you should
+use as much care as you would on the normal scary Internet &mdash; use HTTPS
+or other end-to-end encryption and authentication.
 </li>
 
 <li>
-ØØØØÙÛ ÚÙ Tor ÙÙØØÙØÙ ØÙ ØØÚÙ ÙØÙÛ ØÙØ ØØ ØØ ÚØÙ ÙØ ÙÙÙØ ØØ ÙÙØØ ØØØ ÙÛ ØØØØØ ØØØØØ ØÙÚØÛ ØØ ØÙ ÙØÙØ ÙÛ ØÙØØ: ÚØÙ ÙØÛ ØØÙØ ÙØØØØÙÙ ÙØ ØØ ÙÙÚØØÙØÛ ØØÙ Tor ÙÛ ØÙØÙÙØ ØÙØÙ ØØØØØÙÛ ÙØ ØØÛ ØØÙØÙÙ ÙØÛ ÚØØØØØÛ ÚÙÚÚ ØØØÙÙ ØØÙ ØØÙØ ØÙ ØÙØØ ÙØØÙ ØÙ ØÙÙØÙ ØØÙÙÙ ÙØÙÛ ÙÙØØ ØØØÙØØ ØÙØØ ØØØÛ ØÙØ ØØØØÙ ÚÙÙØ.
-
+ÙÙÚØÙÙÙÙ ØÙØ ØØ ØÙÙÙâÙØÙ ÙÙØÙØ Ù ØØÙØÙØ ØØ ØÙ ØØÙÙ ØØØÙÙ ØÙØ  ØØ ØØÙÙ ÙØØÙØ
+ÙØØÙ ÙØÙ Ù ÙÙÙØ ÙÙØØ ØÙØ ØÙØØÙ ÙÙâÙÙØØ ØÙØÙâÙØÙ ØØÙØÙ ØØ ØÙØØØ ÙÙâÙÙØ: ØÙØÙ
+ÙÙ ØØ Ù ÙØ ØÙ ØÙØØ ÙØØØ ØÙØÙÙ ØØÙ ØØØØØ ÙÙâØÙØÙØ ØÙØ ØØ ØÙ ØÙØØØ ØØØØØÙÙ
+ÙØØÙØ ÙÙØ ÙØ ØØØÙ ØÙØ ØÙÙØÙØÙ ØØÙØÙÙ ØØ ØØØØÙ ÙÙØÙØ ÙÙ ØØÙÙÙâÙØÙÙ ØØ ÙØØØØ Ù
+ÙÙØØ ØØÙÙÙØÙ ØÙÙÙ ØÙØ. ØØ ØÙØÙÙ ÙÙ ØØ ØØØ Ù ØØØØÙ ÙØÙÙÙØØ ÙØØÙØØØ ÙØ
+ØØÙØÙÙâÙØÙÙ ÙÙ ØØ ØØÙÙ ØÙØ ØØØÚØØØÙ ÙØØÙ ØÙØ ÙØÙØÙ ÙØØÙâØÙØØ ØÙÙØ ØØ ØØØ
+ÙÙØØÙ ÙØ ØØØØ ÙÙÙÙØ.
 </li>
 </ol>
 
 <br />
 <p>
-ÙÙØÙØØ ØØØÙØ Ù ØØÙØØØØ ØÙØØØÛ ÚØØ ÚÙÙØ. ØØÙØØ ÚØØ ÚÙÙØ ÚÙ Tor ÚÙ ÚÙØÙØÙÛ ØØØØÙ ÙÛ ÚÙØ Ù ÚÙ ÚÙØÙØÙÛ ØØØØÙ ÙÙÛ ÚÙØ. ØÙÙ ÙÙØØ ÙØÚÙØØ ÚØÙÙ ÙÙØØ Ù ÙØ ØØØÛ <a href="<page volunteer>#Documentation">ØÙØØØÙÛ Ù ØÙØØØØÛ ÙÙÙ ÙÙØØØ</a> ØÙ ÚÙÚ ØÙØ ØØØÙØØ ØØØÙÙ.
+ÙÙØÙØØ ØØØØ Ù ØÙØØ ÙØØ ØÚÙØÙØ. ÙØÙØÙ ØÙÙØ ÙÙ ØÙØ ÚÙ ÚÙØÙØÙÙ ØØ ÙÙØÙÙØØ
+ÙÙâÙÙØ ÙØ ÙÙÙâÙÙØ.  ØÙÙ ÙÙØØ ØØ ÙØÙÙØØ ÙØÙÙ ÙÙØØ Ù ÙØ ØÙ ÙÙÙ ØÙØ ÙÙØØ ØØØÙÙ:
+<a href="<page volunteer>#Documentation">ØÙØØØÙÙ Ù ÙØØÙØØØØÙ ØÙØÙÙ
+ÙÙØÙØØØ</a>
 </p>
+</div>
 
-<hr />
-<br />
+<div class="underline"></div>
+<div class="nb">
+<p>
+<a href="<page verifying-signatures>">ØØØÙØØÙØÙÙ ØØÙÙØ ØÙØØØâÙØÙ
+ØØØÙâÙØ</a>Ù ÙØ ØØ ÙØØÙØÙ ÙÙÙØ ÙÙ ØØØØÙ ÙÙâØÙØ ÙØÙØÙ ØÙÙØ ØØ ØØ ÙØÙÙÙ ÙÙ ÙØ
+ÙØÙØÙ ØØØØÙ ØØØÚØØØÙ ØÙ ØØ ØØØÙâØÙÙØ ØØØÙØØÙ ÙÙÙØ.ØØØÙØØÙØÙÙ ØØÙÙØ ØÙØØØâÙØÙ
+ØØØÙâÙØ ØØ ÙØØÙØÙ ÙÙÙØ.
+</p>
 
-<a id="packagediff"></a>
-<h2><a class="anchor" href="#packagediff">ÙØÙ ØÙÙ ÙØØÙ ÙØÙØØØ Ù ÙØÙØÙØØØÚÙØØØ</a></h2>
+<p>
+ØÚØ ÙØÙÙ ØÙ ØØÙÙÙ ØØ ÙÙØØ ØÙØØ ÙÚØØØÙØÙ ÚØØØÙ ØÙØØ ØØØÙâÙØ ÙØ ØØÙÙØÙâÙØÙ
+ØÙÚØ ÙØØÙØØ ØÙ <a
+href="http://archive.torproject.org/tor-package-archive/";>ØØØÙÙ</a> ÙØ
+ÙØØØØÙ ÙÙÙØ.
+</p>
 
 <p>
-ØØØÙ ÙØÛ ÙØÙØØØ ÙÙØÛ ÙÙØØØ ÙÛ ØÙÙØ ÚÙ ÙØ ØØØÙØØ ØØØÙÙ ÙÙÚÚÛ ÙØ Ù ÚØ ØØØÛ ÚÙØÙÙ ÙØÙ ØØÙÙØ ÙØÙØÙØ ÚØØ. ØÙÙ ØØØÙ ÙØ ÙØÙÙÙØÙ ØØÙÙ ÙØØÙ ÙØÙØØØ VidaliaØ Privoxy Ù Torbutton ÙÛ ØØØØ.
+ØØØÙ ÙØØÙØÙ ØØØÙØØÙØÙÙ ÚØÙØÙ ØÙØ ØØ ØÙØ Ù ÙÙÚÙÙÙ ÚØÙØÙ ØÙØØ ÙØ ØØØÙÙ
+ØÙØØÙâÙØÙ ØÙØ ØÙ <a href="<page documentation>#Developers">ÙØØÙØØØ
+ØÙØØÙâØÙÙØÚØÙ</a> ÙØØØØÙ ÙÙÙØ.  ØÙØ ÙÙÚÙÙÙ ÙÙâØÙØÙÙØ <a href="dist/">ØÙØØ
+ÙØÙÙÙØÙ</a> Ù <a href="dist/vidalia-bundles/?C=M;O=D">ØÙØØ ÙÙØØÙÙØ</a> ØØ
+ÙÙØ ØØØÚØØØÙ ÙÙÙØ.
 </p>
+</div>
+
+<div class="underline"></div>
+<div class="nb">
 <p>
-ØØØÙ ÙØÛ ÙØÙØÙØØØ/ØÙÙØ ÙÙØØØ ÙÛ ØÙÙØØ ØÙØØØØÙÙ ØÙØ ÙÛ ØÙØÙÙØ ØØ ØØÙØÙØ ÙÙÚÚÛ ÙØÛ ØØÙØ Ù ØÙØ ØØÚØÙØØ ØÙ ÙØ ÚÙÚ ÚÙÙØ. ØØÛ ØÚØ ØÙØØÙ ÙØØÙ ØØÙØØØÛ ÙØØØ ØÙ ÙØØÙ ÙØÛ ÙØÙØØØÛ ÚÙ ØØ ØØÙØ ÙÙØØ ØÙØÛ ØØ ØØØØÙ ØØØÙØØ ØØØÙØÙ ØÙØØØÛ ÙÛ ØÙØ ÚÙ ØØ ØÙÙ ØØØÚÙØÛ ÙØ ØØÚØÙØØ ØÙÙÙØÛ ØØÛ ÙØÙØ ØØØØÙ ØØØØ. ÙØØÙ ÙØÛ ÙØÙØÙØØØ ØØÙØØØ VidaliaØ Privoxy Ù Torbutton ØØ ØÙÙ ØØØÙ ÙØÛ ÙØÙØÙØØØ ÚÙØØÙØÙ ØØÙ ØÙØ. ÙØÙØÙ ØÙØØÙ <a href="https://bugs.torproject.org/";>ÚØØØØ ØØÚØÙØØ</a> ØØØÙØ.
+ØÚØ ÙØÙÙÙ ØØ ØØØØÙ ØØ ØØØÚØØØÙ ØÙØ ØØ ØÙÙ ØØÙØ ØØØÙØØ ØÙ <a href="<page
+mirrors>">ÙÙØØ ØÙÚØ ØØÙØÙØÙ ÙÙØØÙ ØØ ØØÙØ ØÙØ</a> ÙØØØØÙ ÙÙÙØ.
 </p>
 
+<a id="ChangeLog"></a> <a id="Stable"></a> <a id="Testing"></a>
+<p>
+ØØØÙ ÙØØÙØÙ ÙÙØØÙ ØØ ØÙÚÙ ÙÙ ØØ ÙØ ÙÚØØØ ÙØÙØØØ ØØÙÙØ ÙØÙØÙ ØØØ ÙÙâØÙØÙÙØ
+ØØÙ ØÙ <a href="<gitblobstable>ReleaseNotes">ÙØØØØØØ ÙÚØØØÙØ</a>
+ØØÙÙØ. ÙÙÚÙÙÙ ØØØÙ ÙØØÙØÙ ÙÙØØ ØØÙÙØØØ ØØ ÙØ ØÙ ÙÚØØØÙØÙ ÙØÙØØØ Ù
+ØÙØØÙâÙØÙØÙØ <a href="<gitblob>ØØØÙÙ ØØÙÙØØØ</a> ØØ ØØÙÙÙØ.
+</p>
+</div>
+<div class="underline"></div>
+
 <a id="Dev"></a>
-<h2><a class="anchor" href="#Dev">ØØØÙ ÙØÛ ØØØØÛ Ù ÚØ ÙÙØØ</a></h2>
+<h2><a class="anchor" href="#Dev">ØØØÙâÙØÙ ØØÙÙâØÙ &amp; ØÙØØ ÙØ</a></h2>
 
 <p>
-ØØØÙ ÙØÛ ØØØØÛ ØØÙÛ Vidalia ÙÙÛ ØØØÙØ.  ØØØÙ ÙØÛ ØØØØÛ ÙÙÙØÙØ ÙÙØ ØØÙÛ Tor ÙÛ ØØØÙØ.  ØØ OSXØ Privoxy Ù Torbutton ØØ ÙÙÚØØÙØÛ ÙØÙÛ ÙØØ ØØÙ ØÙØ.  ØØ ÙÙÙ ÙÙØØØØ ØÙØ ØØÙØ Tor ØØ ØØ ØØÙÙ ØØÙØÙØ ØÙØ ÙÙÚØØÙØÛ ÚÙÙØ.
-
+ØØØÙâÙØÙ ØØÙÙâØÙ ÙÙØ ØØÙÙ ØÙØ ÙØØÙØ.  ØØ ØÙØÙÙ ÙÙØØØØ ØÙØ ØØÙØ ØÙØ ØØ ØØ
+ØØØØ ØÙØØØÙâÙØÙ ØÙØØØÙ ØÙØÙÙ Ù ÙÙÙØØÙØÙ ÙÙÙØ.
 </p>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="3">
+<table cellpadding="6" cellspacing="1" border="0" width="100%">
 <thead>
-<tr bgcolor="e5e5e5">
-<th>ÙØÙÚØÙ</th>
-<th>ØØØÚÙØÛ ÙØØÙ ØØØØ</th>
-<th>ØØØÚÙØÛ ÙØØÙ ÙØÙØÙØØØ</th>
-<th>ØØÙÙÙØ</th>
+<tr bgcolor="#009933" style="color: white; ">
+<th>ØÙØØÙ ØØÙÙ</th>
+<th>ØØØÚØØØÙ ÙØÙØØØ</th>
+<th>ØØØÚØØØÙ ÙØÙØÙØØØ</th>
+<th>ÙØØ Ù ØÙØÙÙØØ</th>
 </tr>
 </thead>
 
 <tr>
-
   <td>
-    ØØØÙ ÙØÙØÚØ ÙÙÙØÙØ (ØØÙÛ TorØ TorbuttonØ Polipo Ù Firefox ØØØ)<br />
+    <img src="images/ico-win.png" />ÙÙÙØÙØ (ÙÙØ ØØÙÙ ØÙØ) <br />
+<small><em>Windows 7, Vista, XP, 2000, 2003 Server</em></small>
   </td>
   <td>
+    <a href="<package-win32-stable>"><version-win32-stable></a> (<a
+href="<package-win32-stable-sig>">sig</a>)
   </td>
   <td>
-# ÙØØØÙØÙ ØØÙØ ØÙ ØØØÙ ÙØÙ ØÙØØØÛ ÙØÙØÚØ ØØØÙ ØÙØ ÙØØØØ ØØØÙØØ # ØØØÛ ÙØØÙ ØÙØÙØ ØÙÙØÙÛ Ù ØÙØÙ. <a href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe">ØÙÚÙÙØÙ</a> (<a href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)
-  </td>  
+    <a href="<package-win32-alpha>"><version-win32-alpha></a> (<a
+href="<package-win32-alpha-sig>">sig</a>)
+  </td>
   <td>
-
-    <a href="<page torbrowser/index>">ØØÙÙÙØÛ ÙØØ Ù ÙÙÚØØÙØÙ</a>
+    <a href="<page docs/tor-doc-windows>">ÙÙÙØÙØ</a>
   </td>
 </tr>
 
 <tr bgcolor="#e5e5e5">
   <td>
-    ÙÙÙØÙØ (ÙÙØ ØØÙÛ Tor ØØØ)<br /> <small>ÙÙØØØØ XPØ 2000Ø ØØÙØ 2003Ø ÙÙÙÙÙÙÙÙØ 98SE</small>
+    <img src="images/ico-osx-uni.png" />ÙÙÙÙØØØ (ÙÙØ ØØÙÙ ØÙØ) </br><small><em>
+ÙÙØ ØØØÙ ÙØØØØÙØÙ ØÙÙØÙ .  ØØÙÙ ÙØÙÙØØØ 10.6 ÙØØÙØØÙÙ ÙÙÙâØÙØ </em></small>
   </td>
-
   <td>
-    <a href="<package-win32-stable>"><version-win32-stable></a>(<a href="<package-win32-stable-sig>">sig</a>)
+    <a href="<package-osx-stable>"><version-osx-stable></a> (<a
+href="<package-osx-stable-sig>">sig</a>)
   </td>
   <td>
-    <a href="<package-win32-alpha>"><version-win32-alpha></a>(<a href="<package-win32-alpha-sig>">sig</a>)
+    <a href="<package-osx-alpha>"><version-osx-alpha></a> (<a
+href="<package-osx-alpha-sig>">sig</a>)
   </td>
-
   <td>
-    <a href="<page docs/tor-doc-windows>">ØØÙÙÙØÛ ÙØØ Ù ÙÙÚØØÙØÙ</a>
+    <a href="<page docs/tor-doc-osx>">ØÙØØÙ ØØÙÙ ÙÙÙÙØØØ</a>
   </td>
 </tr>
 
 <tr>
   <td>
-    ÙÚÙÙØØØ (ØØÙÛ TorØ Torbutton Ù Privoxy ÙÛ ØØØØ)<br /> <small>ØÙØØÙ ØÙØÙÙÛ ØÙØÙÛ (OSX 10.4 Ù 10.5)</small>
-
+    ÙÙÙÙØØØ (ÙÙØ ØØÙÙ ØÙØ) </br><small><em>ÙÙØ ØØØÙ ÙØÙØ ÙÙâØÙ</em></small>
   </td>
   <td>
-    <a href="<package-osx-stable>"><version-osx-stable></a>(<a href="<package-osx-stable-sig>">sig</a>)
+    <a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a
+href="<package-oldosx-stable-sig>">sig</a>)
   </td>
   <td>
-    <a href="<package-osx-alpha>"><version-osx-alpha></a>(<a href="<package-osx-alpha-sig>">sig</a>) 
+    <a href="<package-oldosx-alpha>"><version-oldosx-alpha></a> (<a
+href="<package-oldosx-alpha-sig>">sig</a>)
   </td>
-
   <td>
-    <a href="<page docs/tor-doc-osx>">ØØÙÙÙØÛ ÙØØ Ù ÙÙÚØØÙØÙ</a>
+    <a href="<page docs/tor-doc-osx>">ØÙØØÙ ØØÙÙ ÙÙÙÙØØØ</a>
   </td>
 </tr>
 
 <tr bgcolor="#e5e5e5">
   <td>
-    ÙÚÙÙØØØ (ØØÙÛ TorØ Torbutton Ù Privoxy ÙÛ ØØØØ)<br /> <small>ÙÙØ PowerPC   (OSX 10.3)</small>
-
+    <img src="images/ico-tux.png" />ØØØÙâÙØÙ ÙÙÙÙÙØ/ÙÙÙÙÙØ (ÙÙØ ØØÙÙ
+ØÙØ)</br><small><em>ØØâÙØ/ØÙØ ØÙâØØØ ÙØÙØØØ ØØÙØÙØ ØØÙÙØÙØ ØÙØÙ</em></small>
   </td>
-  <td>
-    <a href="<package-oldosx-stable>"><version-oldosx-stable></a>(<a href="<package-oldosx-stable-sig>">sig</a>)
+  <td colspan="2">
+    <a href="<page download-unix>">ØÙØÙ ØØØÚØØØÙ ÙÙÙÙÙØ/ÙÙÙÙÙØ</a>
   </td>
   <td>
-    <a href="<package-oldosx-alpha>"><version-oldosx-alpha></a>(<a href="<package-oldosx-alpha-sig>">sig</a>) 
+    <a href="<page docs/tor-doc-unix>">ÙÙÙÙÙØ/ØÙâØØâØÙ/ÙÙÙÙÙØ</a>
   </td>
-
-  <td>
-    <a href="<page docs/tor-doc-osx>">ØØÙÙÙØÛ ÙØØ Ù ÙÙÚØØÙØÙ</a>
-  </td>
 </tr>
 
 <tr>
   <td>
-    ØØØÙ ÙØÛ ÙÙÙÙÚØ/ÙÙÙÙÚØ (ÙÙØ ØØÙÛ Tor)<br /> <small>Redhat/CentOSØ FedoraØ DebianØ UbuntuØ SUSE</small>
-
+    ØÙØØ ØØØØØÙØ <br /> <kbd>./configure &amp;&amp; make &amp;&amp;
+src/or/tor</kbd>
   </td>
-  <td colspan="2">
-    <a href="<page download-unix>">ØÙØÙ ØØØÚÙØÛ ÙÙÙÙÚØ/ÙÙÙÙÚØ</a>
-  </td>
   <td>
-    <a href="<page docs/tor-doc-unix>">ØØÙÙÙØÛ ÙØØ Ù ÙÙÚØØÙØÙ</a>
+    <a href="<package-source-stable>"><version-stable></a> (<a
+href="<package-source-stable-sig>">sig</a>)
   </td>
-</tr>
-
-<tr bgcolor="#e5e5e5">
   <td>
-    Source tarballs<br /> <kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>
+    <a href="<package-source-alpha>"><version-alpha></a> (<a
+href="<package-source-alpha-sig>">sig</a>)
   </td>
   <td>
-
-    <a href="<package-source-stable>"><version-stable></a>(<a href="<package-source-stable-sig>">sig</a>)
   </td>
-  <td>
-    <a href="<package-source-alpha>"><version-alpha></a>(<a href="<package-source-alpha-sig>">sig</a>)
-  </td>
-  <td>
-  </td>
 
 </tr>
 </table>
 
-<br />
+</div>
 
-<p>
-ØÙ <a href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures";>ÙØØÙ ØØØÙØØ ÙØØØÙÙ ØØØÛ ØØØØÛ ÚØÙØÛ ÙØÙØ ØØØÙ</a> ÙØØØØÙ ÚÙÙØ ÚÙ ØÙ ØÙØ ØØÙÙÙØÙ ÙÛ ØÙØ ÙØÙÙÛ ØØ ØØØÚÙØÛ ÚØØÙ ØÙØ ÚÙ ÙØ ØØØÛ ØÙØ ØØ ÙØØ ÚØÙØÙ ØÙÙ.
-</p>
 
-<p>
-ØØØØÙØ ØØØÙØØÙØÙÙ ÙØÛ ÙØØÙØ ØÙ ÙØÚØÛ Tor ØØ SVN ØÙØ ØØØØØÛ ØÙ ØØÙØØØÙÙ ÙØØÙ ØÙØØÙ ÙØÙØÙØ ØÙ <a href="<page documentation>#Developers">ØØÙØØ ØØÙØÙÙ ÙÙÙØ</a> ÙØØØØÙ ÚÙÙØ. ÙÙÚÙÙÙ ÙÛ ØÙØÙÙØ <a href="dist/">ÙÙØØ Privoxy</a> ÙØ <a href="dist/vidalia-bundles/?C=M;O=D">ÙÙØØ Vidalia</a> ØØ ØØØÚÙØÛ ÚÙÙØ.
 
-</p>
-
-<p>
-ØÚØ ØØØÚÙØÛ Tor ØØ ØÙÙ ØØÙØ ÙØÚÙ ØØØØ <a href="<page mirrors>">ÙÙØØ ØØÙØ ÙØÛ  ÙØÚÙØ ØØÙØ Tor</a> ØÙÙØØ ÙÙØÙØ ÙÛ ØØØØ.
-</p>
-
-<a id="ChangeLog"></a> <a id="Stable"></a> <a id="Testing"></a>
-<p>
-ØØ ØØÙØ ÙÙØØÛ ØØ ØØÙÙØØØ ØÙØØØ ØØÙ ØØ ÙØ ÙØØÙ ÙØÙØØØ Tor ØÙ <a href="<gitblob>ReleaseNotes">ReleaseNotes</a> ÙØØØØÙ ÚÙÙØ. ØØ ØØÙØ ÙÙØØÛ ØØ ØØÙÙØØØ ØÙØØØ ØØÙ ØØ ÙØØÙ ÙØÛ ÙØÙØØØ Ù ÙÙØØÙØÙØ ØÙ <a href="<gitblob>ChangeLog">ChangeLog</a> ÙØØØØÙ ÚÙÙØ.
-
-</p>
-
-</div><!-- #main -->
-
 #include <foot.wmi>
-

Modified: website/trunk/fi/download.wml
===================================================================
--- website/trunk/fi/download.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fi/download.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -249,14 +249,14 @@
 </li>
 
 <li>
-Tor estÃÃ paikallistamasta sinua verkkoliikenteesi alkulÃhteenÃ, se salaa
-kaiken liikenteen sinun ja Tor verkon vÃlillà ja se salaa liikenteen Tor
-verkon sisÃllÃ, mutta se ei voi salata <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>Tor
-verkosta ulos kohdepalvelimelle lÃhtevÃÃ liikennettÃ.</a> Jos lÃhetÃt
-arkaluontoista tietoa, sinun tulisi olla yhtà huolellinen kuin aina
-ollessasi Internetissà &mdash; kÃyttà HTTPS tai muuta pÃÃstÃ-pÃÃhÃn salausta
-ja tunnistusta.
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network, but
+<a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you should
+use as much care as you would on the normal scary Internet &mdash; use HTTPS
+or other end-to-end encryption and authentication.
 </li>
 
 <li>

Modified: website/trunk/fi/index.wml
===================================================================
--- website/trunk/fi/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fi/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -64,16 +64,14 @@
 tee</a>.</p>
 
 <p>
-Tor verkon turvallisuus paranee kÃyttÃjÃkunnan kasvaessa ja kun yhÃ
-useammat vapaaehtoiset pyÃrittÃvÃt <a href="<page docs/tor-doc-relay>">Tor
-vÃlityspalvelimia</a>./n(VÃlityspalvelimen kÃyttÃÃnotto ei ole lÃheskÃÃn
-niin monimutkaista kun voisi kuvitella ja se voi merkittÃvÃsti <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>
-parantaa omaakin turvallisuuttasi</a>.)/n  Jos vÃlityspalvelimen
-pyÃrittÃminen ei kuitenkaan tunnu omalta jutulta, tarvitsemme <a href="<page
-volunteer>">apua monissa projektin muissa osissa</a>, tarvitsemme myÃs
-rahoitusta jatkaaksemme Tor verkon tekemistà nopeammaksi ja
-helppokÃyttÃisemmÃksi samalla kun huolehdimme sen turvallisuudesta.</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor on rekisterÃity usassa (501 (c) (3) U.S.) ja on voittoa tuottamaton. Sen
 tarkoituksena on mahdollistaa anonyymi internetin kÃyttÃ. Voit tehdà <a

Modified: website/trunk/fr/bridges.wml
===================================================================
--- website/trunk/fr/bridges.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/bridges.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -36,18 +36,16 @@
 </p>
 
 <p>
-A noter qu'il est Ãgalement possible que Tor soit non-opÃrant pour d'autres
-raisons. La derniÃre version du <a href="<page torbrowser/index>">"Tout en
-un" Navigateur+Tor </a> pour Windows essaye de vous donner les causes
-possibles des problÃmes que Tor rencontre pour se connecter. Vous devriez
-Ãgalement lire <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>la
-FAQ sur les problÃmes de fonctionnement de Tor</a> lorsque ces derniers
-surviennent.  Si vous avez l'intuition que le problÃme vient d'un bloquage
-Ãvident ou si vous avez envie d'essayer parce que vous n'Ãtes pas sÃr ou
-tout simplement, si vous voulez tenter l'aventure, merci de lire ce qui
-suit. Assurez-vous d'utiliser la <a href="<page download>#Dev">derniÃre
-version 0.2.1.x ou 0.2.2.x pour votre plateforme</a>.
+Note that it's also possible that Tor is non-functional for other
+reasons. The latest version of <a href="<page torbrowser/index>">The Tor
+Browser Bundle</a> on Windows tries to give you better hints about why Tor
+is having problems connecting. You should also read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>the
+FAQ about problems with running Tor properly</a> when you have issues.  If
+you feel that the issue is clearly blocking, or you'd simply like to try
+because you're unsure or feeling adventurous, please read on. Ensure that
+you're using the <a href="<page download>#Dev">latest 0.2.1.x or 0.2.2.x
+bundle for your platform</a>.
 </p>
 
 <p>
@@ -164,9 +162,9 @@
 vous pouvez faire fonctionner un relais-passerelle à la place. Vous pouvez
 la configurer de la maniÃre suivante:
 <ul>
-<li> editer manuellement <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>votre
-fichier torrc</a> avec les quatre lignes qui suivent:<br />
+<li> manually <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>edit
+your torrc file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -179,11 +177,10 @@
 </ul>
 </p>
 
-<p>Si vous rÃcupÃrez des erreurs au dÃmarrage du type: "Could not bind to
-0.0.0.0:443: Permission denied", vous aurez besoin d'utiliser un ORPort plus
-grand (ex: 8080) ou de mettre en place <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>des
-routages de port complexes<a>.
+<p>If you get "Could not bind to 0.0.0.0:443: Permission denied" errors on
+startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>some
+complex port forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/fr/contact.wml
===================================================================
--- website/trunk/fr/contact.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/contact.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -41,12 +41,10 @@
 <li><tt>tor-ops</tt> permet de contacter la personne qui gÃre les autoritÃs
 d'annuaire. Utilisez-la si vous faÃtes fonctionner un noeud Tor et que vous
 avez des questions ou des problÃmes avec.</li>
-<li><tt>tor-webmaster</tt> permet de rÃparer les erreurs typographiques sur le
-site web, de changer les dÃclarations ou les redirections erronÃes et
-d'ajouter de nouvelles sections et de nouveaux paragraphes que vous nous
-envoyez. Vous voudrez peut-Ãtre crÃer un brouillon de vos nouvelles sections
-sur <a href="https://wiki.torproject.org/noreply/TheOnionRouter";>le wiki
-Tor</a> d'abord.</li>
+<li><tt>tor-webmaster</tt> can fix typos on the website, change wrong statements
+or directions on the website, and add new sections and paragraphs that you
+send us. You might want to make a draft of your new sections on <a
+href="https://trac.torproject.org/projects/tor/wiki";>the Tor wiki</a> first.</li>
 <li><tt>tor-volunteer</tt> est là pour lire vos documents, vos patchs, vos
 tests, vos expÃriences avec les applications concernÃes et tout ce qui a ÃtÃ
 inspirà par notre <a href="<page volunteer>">page sur la contribution</a>

Modified: website/trunk/fr/documentation.wml
===================================================================
--- website/trunk/fr/documentation.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/documentation.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -40,36 +40,32 @@
 </li>
 
 <li>
-Notre <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ";>FAQ</a>
-couvre toutes sortes de thÃmes, incluant les questions traitant du
-paramÃtrage client ou relais, concernant les attaques d'anonymat, pourquoi
-nous n'avons pas construit Tor sur d'autres bases, etc.  Il y a une <a
-href="<page faq-abuse>">FAQ sur les abus</a> sÃparÃe pour rÃpondre aux
-questions frÃquentes posÃes par ou à l'intention des opÃrateurs de relais.
-La <a href="<page eff/tor-legal-faq>">FAQ des contentieux Tor</a> est Ãcrite
-par des juristes de l'EFF, et a pour but de vous apporter une vue d'ensemble
-de quelques problÃmes lÃgaux qui peuvent survenir du Projet Tor aux
-Ãtats-Unis. 
+Our <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>FAQ</a>
+covers all sorts of topics, including questions about setting up a client or
+relay, concerns about anonymity attacks, why we didn't build Tor in other
+ways, etc.  There's a separate <a href="<page faq-abuse>">Abuse FAQ</a> to
+answer common questions from or for relay operators.  The <a href="<page
+eff/tor-legal-faq>">Tor Legal FAQ</a> is written by EFF lawyers, and aims to
+give you an overview of some of the legal issues that arise from the Tor
+project in the US.
 </li>
 
-<li>Le <a href="<page tor-manual>">manuel</a> liste toutes les entrÃes possibles
-que vous pouvez mettre dans votre fichier <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>torrc</a>.
-Nous apportons Ãgalement un <a href="<page tor-manual-dev>">manuel pour la
-version de dÃveloppement de Tor</a>.</li>
+<li>The <a href="<page tor-manual>">manual</a> lists all the possible entries
+you can put in your <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>torrc
+file</a>. We also provide a <a href="<page tor-manual-dev>">manual for the
+development version of Tor</a>.</li>
 
-<li>Si vous avez des questions, nous avons un canal IRC (pour les utilisateurs,
-les opÃrateurs de relais, et les dÃveloppeurs) <a
-href="irc://irc.oftc.net/tor">#tor sur irc.oftc.net</a>. Si vous rencontrez
-un problÃme, spÃcialement un problÃme de stabilitÃ, lisez <a
-href="https://wiki.torproject.org/wiki/TheOnionRouter/TorFAQ#RelayCrashing";>comment
-rapporter un bug Tor</a> en premier et fournissez-nous le maximum
-d'information sur ce problÃme, selon vos possibilitÃs, sur <a
-href="https://bugs.torproject.org/tor";>notre bugtracker</a>. (Si votre bug
-concerne Polipo, votre navigateur, ou d'autres applications, merci de ne pas
-le rentrer dans notre bugtracker.) La <a href="#MailingLists">liste de
-diffusion or-talk</a> peut Ãgalement Ãtre utile. 
+<li>If you have questions, we have an IRC channel (for users, relay operators,
+and developers)  at <a href="irc://irc.oftc.net/tor">#tor on
+irc.oftc.net</a>. If you have a bug, especially a crash bug, read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#MyTorkeepscrashing.";>how
+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 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>
 
 <li>
@@ -250,13 +246,12 @@
 <a id="NeatLinks"></a>
 <h2><a class="anchor" href="#NeatLinks">Liens utiles</a></h2>
 <ul>
-<li>Le <a href="https://wiki.torproject.org/noreply/TheOnionRouter";>wiki Tor</a>
-rassemble un grand nombre de contributions faites par les utilisateurs de
-Tor. Jetez-y un coup d'oeil.</li>
+<li>The <a href="https://trac.torproject.org/projects/tor/wiki";>Tor wiki</a>
+provides a plethora of helpful contributions from Tor users. Check it out!</li>
 <li><a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>Une
-liste de programmes auxiliaires qui peuvent Ãtre utilisÃs en association
-avec Tor</a>.</li>
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>A
+list of supporting programs you might want to use in association with
+Tor</a>.</li>
 <li><a href="https://check.torproject.org/";>Le dÃtecteur Tor</a> ou <a
 href="http://torcheck.xenobite.eu/";>L'autre Detecteur Tor</a> essaye de
 dÃterminer si vous utilisez Tor ou non.</li>

Modified: website/trunk/fr/download.wml
===================================================================
--- website/trunk/fr/download.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/download.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -255,14 +255,14 @@
 </li>
 
 <li>
-Tor anonymise l'origine de votre trafic et chiffre tout entre vous et le
-rÃseau Tor ainsi qu'Ã l'intÃrieur du rÃseau Tor, mais <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>il
-ne peut pas chiffrer votre trafic entre le rÃseau Tor et sa destination
-finale.</a> Si vous envoyez des informations sensibles, vous devriez prendre
-autant de prÃcautions que lorsque vous Ãtes sur lIinternet normal &mdash;
-utilisez HTTPS ou des mÃcanismes de chiffrement et d'authentification
-similaires.
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network, but
+<a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you should
+use as much care as you would on the normal scary Internet &mdash; use HTTPS
+or other end-to-end encryption and authentication.
 </li>
 
 <li>

Modified: website/trunk/fr/faq.wml
===================================================================
--- website/trunk/fr/faq.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/faq.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -87,10 +87,9 @@
 noeud de sortie ?</a></li>
 </ul>
 
-<p>Pour les question qui ne sont pas encore sur cette version de la FAQ,
-consultez la <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ";>FAQ du wiki
-FAQ</a>.</p>
+<p>For other questions not yet on this version of the FAQ, see the <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>wiki
+FAQ</a> for now.</p>
 
 <hr /> <a id="General"></a> <a id="WhatIsTor"></a>
 <h3><a class="anchor" href="#WhatIsTor">Qu'es-ce-que Tor ?</a></h3>
@@ -203,15 +202,15 @@
 </p>
 
 <p>
-Il existe beaucoup d'autres programmes que vous pouvez utiliser avec Tor,
-mais nous n'avons pas Ãtudià les problÃmes d'anonymat au niveau applicatif
-sur eux. Notre wiki dispose d'une liste d'instructions pour <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>
-Torifier les applications spÃcifiques</a>. Il y a Ãgalement une <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>
-liste des applications qui vous aident à rediriger votre trafic à travers
-Tor</a>.  Merci d'ajouter du contenu à ces listes et de nous aider à les
-garder à jour !
+There are plenty of other programs you can use with Tor, but we haven't
+researched the application-level anonymity issues on them well enough to be
+able to recommend a safe configuration. Our wiki has a list of instructions
+for <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO";>Torifying
+specific applications</a>. There's also a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>list
+of applications that help you direct your traffic through Tor</a>.  Please
+add to these lists and help us keep them accurate!
 </p>
 
 <hr /> <a id="WhyCalledTor"></a>
@@ -438,15 +437,14 @@
 </li>
 
 <li>
-Il ya quelques Ãtapes que les individus peuvent suivre pour amÃliorer leurs
-performances avec Tor. <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/FireFoxTorPerf";>Vous
-pouvez configurer votre navigateur Firefox pour mieux gÃrer Tor</ a>, <a
-href="http://www.pps.jussieu.fr/~jch/software/polipo/tor.html";>vous pouvez
-utiliser Polipo avec Tor</a>, ou vous pouvez essayer <a href="<page
-download>">de vous mettre à jour vers la derniÃre version de Tor</a>. Si
-cela fonctionne correctement, merci de nous aider en documentant ce que vous
-avez fait, et nous le faisant connaÃtre.
+There are some steps that individuals can take to improve their Tor
+performance. <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/FireFoxTorPerf";>You
+can configure your Firefox to handle Tor better</a>, <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/tor.html";>you can use
+Polipo with Tor</a>, or you can try <a href="<page download>">upgrading to
+the latest version of Tor</a>.  If this works well, please help by
+documenting what you did, and letting us know about it.
 </li>
 
 <li>
@@ -754,12 +752,11 @@
 <li>ELE est un LiveCD Linux qui est centrà sur les logiciels de protection de la
 vie privÃe. Il inclus Tor et vous pouvez le tÃlÃcharger sur <a
 href="http://www.northernsecurity.net/download/ele/";>http://www.northernsecurity.net/download/ele/</a>.</li>
-<li>Virtual Privacy Machine est un LiveCD Linux qui inclut Firefox, Privoxy,
-Tor, certains IRC et des applications de messagerie instantanÃe ainsi qu'un
-ensemble de rÃgles ipchains visant à empÃcher le trafic non-Tor de quitter
-accidentellement votre ordinateur. Plus d'informations sur <a
-href="https://wiki.torproject.org/noreply/VirtualPrivacyMachine";>
-https://wiki.torproject.org/noreply/VirtualPrivacyMachine</a>.</li>
+<li>Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy,
+Tor, some IRC and IM applications, and a set of ipchains rules aimed to
+prevent non-Tor traffic from accidentally leaving your computer. More
+information at <a
+href="https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine";>https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine</a>.</li>
 <li>Anonym.OS est un LiveCD similaire au prÃcÃdent, mais est basà sur OpenBSD
 plutÃt que Linux pour une sÃcurità maximale. Il a Ãtà conÃu pour Ãtre
 anonyme et sÃcurisà à partir de zÃro, et possÃde donc des caractÃristiques
@@ -847,13 +844,12 @@
 </p>
 
 <ul>
-<li>Tor a une gestion interne <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth";>
-de limites de flux</a>. De plus, si vous avez un lien rapide mais que vous
-dÃsirez limiter le nombre d'octets que vous allez offrir par jour (ou par
-semaine ou par mois), consultez <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Hibernation";>la
-fonctionnalità d'hibernation</a>.
+<li>Tor has built-in support for <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#LimitBandwidth";>
+rate limiting</a>. Further, if you have a fast link but want to limit the
+number of bytes per day (or week or month) that you donate, check out the <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Hibernation";>hibernation
+feature</a>.
 </li>
 <li>Chaque noeud Tor a une <a href="#ExitPolicies">politique de sortie</a> qui
 spÃcifie quelles sortes de connexions sont autorisÃes ou refusÃes depuis ce
@@ -870,12 +866,11 @@
 simplement l'option de configuration Address vide et Tor tentera de la
 deviner.
 </li>
-<li>Si votre noeud est situà dÃrriÃre un NAT et qu'il ne connaÃt pas son adresse
-IP publique (ex: il a une IP en 192.168.x.y), vous aurez besoin de
-configurer la redirection de port. La redirection des connexions TCP dÃpend
-du systÃme mais <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>cette
-entrÃe de la FAQ</a> montre quelques exemples sur comment y parvenir.
+<li>If your relay is behind a NAT and it doesn't know its public IP (e.g. it has
+an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP
+connections is system dependent but <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>this
+FAQ entry</a> offers some examples on how to do this.
 </li>
 <li>Votre noeud va estimer de maniÃre passive sa capacità de bande passante et
 la publier, ainsi un noeud à large bande passante attirera davantage
@@ -910,20 +905,17 @@
 </p>
 
 <p>
-La politique de sortie par dÃfaut permet d'accÃder à plusieurs services
-populaires (par exemple la navigation Web), mais <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#DefaultPorts";>en
-restreint</a> certains en raison d'abus potentiel (mail par exemple) et
-d'autres dont le rÃseau Tor ne peut pas gÃrer la charge (par exemple les
-ports de partage de fichier par dÃfaut). Vous pouvez modifier votre
-politique de sortie en utilisant l'onglet Vidalia "Partage", ou en modifiant
-manuellement votre fichier <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>torrc</a>.
-Si vous voulez Ãviter la plupart sinon la totalità des risques d'abus,
-indiquez "reject *:*" (ou dÃcocher toutes les cases dans Vidalia). Ce
-paramÃtre signifie que votre relais va Ãtre utilisà pour relayer le trafic Ã
-l'intÃrieur du rÃseau Tor, mais pas pour les connexions à des sites externes
-ou d'autres services.
+The default exit policy allows access to many popular services (e.g. web
+browsing), but <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#DefaultPorts";>restricts</a>
+some due to abuse potential (e.g. mail) and some since the Tor network can't
+handle the load (e.g. default file-sharing ports). You can change your exit
+policy using Vidalia's "Sharing" tab, or by manually editing your <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#torrc";>torrc</a>
+file. If you want to avoid most if not all abuse potential, set it to
+"reject *:*" (or un-check all the boxes in Vidalia). This setting means that
+your relay will be used for relaying traffic inside the Tor network, but not
+for connections to external websites or other services.
 </p>
 
 <p>
@@ -996,11 +988,11 @@
 buffer memory more aggressively</a>. If you update to OpenSSL 1.0.0-beta5,
 Tor's build process will automatically recognize and use this feature.</li>
 
-<li>Si vous utilisez Solaris, OpenBSD, NetBSD ou un vieux FreeBSD, Tor "forke"
-probablement ses processus plutÃt que d'utiliser des "threads". Pensez Ã
-migrer vers un <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayOS";>meilleur
-systÃme d'exploitation</a>.</li>
+<li>If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is
+probably forking separate processes rather than using threads. Consider
+switching to a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayOS";>better
+operating system</a>.</li>
 
 <li>Si vous ne pouvez toujours pas gÃrer la charge mÃmoire, vous pouvez
 envisager de rÃduire la bande passante que votre relais affiche. Afficher
@@ -1108,17 +1100,16 @@
 utilisateur de Tor soit un noeud.</a></h3>
 
 <p>
-Imposer que chaque utilisateur de Tor soit un noeud nous aiderait à Ãtendre
-le rÃseau pour gÃrer tous les utilisateurs, de plus <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>faire
-fonctionner un noeud Tor peut amÃliorer votre anonymat</a>. Toutefois, de
-nombreux utilisateurs de Tor ne peuvent pas faire de bons noeuds, par
-exemple, quelques clients Tor fonctionnent derriÃre des pare-feux
-restrictifs, sont connectÃs par modem ou bien sont dans une position oà ils
-ne peuvent pas relayer de trafic. Fournir des services à ces clients est une
-tÃche importante dans la prÃservation de l'anonymat pour tout le monde,
-Ãtant donnà que de nombreux utilisateurs de Tor sont soumis à ces
-contraintes.
+Requiring every Tor user to be a relay would help with scaling the network
+to handle all our users, and <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>running
+a Tor relay may help your anonymity</a>. However, many Tor users cannot be
+good relays &mdash; for example, some Tor clients operate from behind
+restrictive firewalls, connect via modem, or otherwise aren't in a position
+where they can relay traffic. Providing service to these clients is a
+critical part of providing effective anonymity for everyone, since many Tor
+users are subject to these or similar constraints and including these
+clients increases the size of the anonymity set.
 </p>
 
 <p>
@@ -1146,14 +1137,14 @@
 </p>
 
 <p>
-Ensuite, nous avons besoin de progresser sur l'estimation automatique de la
-quantità de bande passante à allouer. Consultez l'item #7 de la <a
-href="<page volunteer>#Research">section recherche de la page des
-contributeurs</a>: "Tor ne fonctionne pas bien lorsque les noeuds ont une
-bande passante asymÃtrique (ex: cÃble ou ADSL)". Il semble que la <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#TransportIPnotTCP";>migration
-vers le transport par UDP</a> soit la rÃponse la plus simple dans ce cas, ce
-qui hÃlas n'est pas une rÃponse si simple que Ãa.
+Second, we still need to get better at automatically estimating the right
+amount of bandwidth to allow. See item #7 on the <a href="<page
+volunteer>#Research">research section of the volunteer page</a>: "Tor
+doesn't work very well when relays have asymmetric bandwidth (e.g. cable or
+DSL)". It might be that <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#TransportIPnotTCP";>switching
+to UDP transport</a> is the simplest answer here &mdash; which alas is not a
+very simple answer at all.
 </p>
 
 <p>
@@ -1210,9 +1201,9 @@
 propros de mon noeud de sortie ?</a></h3>
 
 <p>
-Une collection de modÃles pour rÃpondre correctement à votre FAI est
-disponible <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";>ici</a>.
+A collection of templates for successfully responding to ISPs is <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorAbuseTemplates";>collected
+here</a>.
 </p>
 
 <hr />

Modified: website/trunk/fr/hidden-services.wml
===================================================================
--- website/trunk/fr/hidden-services.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/hidden-services.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -117,17 +117,16 @@
 </p>
 
 <p>
-A ce moment, il est primordial que le service cachà conserve le mÃme
-ensemble de <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#EntryGuards";>noeuds
-gardiens</a> pour crÃer de nouveaux circuits. Autrement, un attaquant
-pourrait utiliser son propre relais et forcer le service cachà à crÃer un
-nombre arbitraire de circuits dans l'espoir que le relais corrompu puisse
-Ãtre dÃsignà comme un noeud d'entrÃe et rÃcupÃrer l'adresse IP du serveur en
-faisant de l'analyse temporelle. Cette attaque a Ãtà dÃcrite par
-&Oslash;verlier et Syverson dans leur document intitulà <a
-href="http://freehaven.net/anonbib/#hs-attack06";>Localiser des Serveurs
-CachÃs</a>.
+At this point it is of special importance that the hidden service sticks to
+the same set of <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Whatsthisaboutentryguardformerlyknownashelpernodes";>entry
+guards</a> when creating new circuits. Otherwise an attacker could run his
+own relay and force a hidden service to create an arbitrary number of
+circuits in the hope that the corrupt relay is picked as entry node and he
+learns the hidden server's IP address via timing analysis. This attack was
+described by &Oslash;verlier and Syverson in their paper titled <a
+href="http://freehaven.net/anonbib/#hs-attack06";>Locating Hidden
+Servers</a>.
 </p>
 
 # it should say "Bob connects to Alice's ..."

Modified: website/trunk/fr/index.wml
===================================================================
--- website/trunk/fr/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -69,16 +69,14 @@
 peut pas faire pour vous</a>.</p>
 
 <p>
-La sÃcurità de Tor s'accroÃt d'autant plus que le nombre d'utilisateurs et
-de volontaires pour <a href="<page docs/tor-doc-relay>">faire tourner un
-relais</a> augmente. (Ce n'est pas aussi compliquà qu'on peut le croire, et
-cela peut <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>amÃliorer
-votre propre sÃcuritÃ</a> de maniÃre significative.)  Si vous ne souhaitez
-pas faire tourner un relais, nous avons besoin d' <a href="<page
-volunteer>">aide sur plusieurs points du projet</a>, et nous avons besoin de
-financements pour continuer à rendre le rÃseau Tor plus rapide et plus
-facile à utiliser tout en maintenant une bonne sÃcuritÃ.</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor est une association amÃricaine à but non lucratif 501(c)(3) dont la
 mission est de vous prÃmunir de l'analyse de votre trafic Internet. Faites

Modified: website/trunk/fr/people.wml
===================================================================
--- website/trunk/fr/people.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/people.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -20,6 +20,7 @@
 <ul>
 <li><a href="<page people>#Core">Personnes du coeur de projet</a></li>
 <li><a href="<page people>#Board">Membres du bureau</a></li>
+<li><a href="<page people>#GSoC">Summer Students</a></li>
 <li><a href="<page people>#Translators">Traducteurs</a></li>
 <li><a href="<page people>#Volunteers">Volontaires</a></li>
 <li><a href="<page people>#Past">Anciens contributeurs</a></li>
@@ -167,6 +168,19 @@
 </dl>
 
 <div class="underline"></div>
+<a id="GSoC"></a>
+<h3><a class="anchor" href="#GSoC">Google Summer of Code 2010 students:</a></h3>
+
+<dl>
+<dt>Kevin Berry</dt><dd>blurb here</dd>
+<dt>Harry Bock</dt><dd>blurb here</dd>
+<dt>Kory Kirk</dt><dd>Worked during Google Summer of Code 2009 on extending Torbutton. Now he's
+working on implementing hidden services for our java Tor client. Mentored by
+Bruce Leidl.</dd>
+<dt>John Schanck</dt><dd>blurb here</dd>
+</dl>
+
+<div class="underline"></div>
 <a id="Translators"></a>
 <h3><a class="anchor" href="#Translators">Traducteurs principaux:</a></h3>
 
@@ -201,9 +215,6 @@
 <dt>Fabian Keil</dt><dd>L'un des principaux dÃveloppeurs de Privoxy, et Ãgalement un fan de Tor. Il
 est la raison pour laquelle Tor et Privoxy continuent de bien fonctionner
 ensemble.</dd>
-<dt>Kory Kirk</dt><dd>A travaillà lors du Google Summer of Code 2009 sur l'amÃlioration de
-Torbutton. Maintenant, il travaille avec Bruce Leidl sur la rÃalisation d'un
-client Tor en Java.</dd>
 <dt>Bruce Leidl</dt><dd>Travaille à la rÃalisation d'un client Tor en Java.</dd>
 <dt>Julius Mittenzwei</dt><dd>Un juriste travaillant avec le CCC en Allemagne. Coordonne la communautà Tor
 Allemande au regard des aspects et des questions juridiques.</dd>
@@ -217,11 +228,10 @@
 virtuelle pour les clients Tor sous Windows.</dd>
 <dt>row (un pseudonyme -- il tient à rester anonyme, mÃme de nous !)</dt><dd>Le plus dÃvouà rapporteur de bug que nous connaissons. Il doit lire le code
 source de Tor chaque jour au petit dÃjeuner.</dd>
-<dt>tup (un autre pseudonyme)</dt><dd>Ajoute pÃriodiquement des fonctionnalitÃs pour rendre Tor plus facile Ã
-utiliser tel que <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";>le
-proxy transparent</a>. Maintient Ãgalement <a
-href="http://p56soo2ibjkx23xo.onion/";>le code de TorDNSEL</a>.</dd>
+<dt>tup (un autre pseudonyme)</dt><dd>Periodically adds new features for making Tor easier to use as a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TransparentProxy";>transparent
+proxy</a>. Also maintains the <a
+href="http://p56soo2ibjkx23xo.onion/";>TorDNSEL code</a>.</dd>
 <dt>Kyle Williams</dt><dd>DÃveloppeur de JanusVM, un proxy Tor transparent basà sur VMWare qui rend
 Tor plus facile à configurer et à utiliser.</dd>
 <dt>Ethan Zuckerman</dt><dd>Un blogueur qui a Ãcrit plusieurs <a

Modified: website/trunk/fr/running-a-mirror.wml
===================================================================
--- website/trunk/fr/running-a-mirror.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/running-a-mirror.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -13,25 +13,17 @@
 <h2>Tor: Mettre en place un Miroir</h2>
 <hr />
 
-<p>Merci de vouloir monter un miroir du site web de Tor. Tous nos miroirs sont
-listÃs publiquement sur <a href="<page mirrors>">notre page des
-miroirs</a>.  Nous avons inclus des exemples de commandes et de
-configuration ci-dessous afin de faciliter l'installation initiale et la
-maintenance en continue.  Le site web de Tor et le rÃpertoire de
-distribution occupent 1,6 Go d'espace disque.  Le rÃpertoire /dist occupe
-230Mo à lui tout seul.</p>
+<p>Thank you for wanting to mirror the Tor website.  All of our mirrors are
+publicly listed on <a href="<page mirrors>">our mirrors page</a>.  We've
+included some sample commands and configuration below to make the initial
+setup and ongoing maintenance a minimal effort.  The Tor website and
+distribution directory currently require 5.0 GB of disk space.</p>
 
 <p>
-Si vous dÃsirez faire fonctionner un miroir (site web+dist), il suffit de
-lancer cette commande pour tÃlÃcharger tout ce qu'un miroir doit partager
-avec le reste du monde: <br /> <br /> <tt> rsync -av --delete
-rsync://rsync.torproject.org/tor tor-mirror/ </tt> <br /> <br /> Si vous
-souhaitez faire tourner un miroir de distribution, il suffit de lancer cette
-commande pour tÃlÃcharger tout ce dont a besoin un miroir de distribution:
-<br /> <br /> <tt> rsync -av --delete rsync://rsync.torproject.org/tor/dist
-tor-mirror-dist/ </tt>
+If you would like to run a mirror, it's as easy as this command to download
+everything a mirror should share with the world: <br /> <br /> <tt> rsync
+-av --delete rsync://rsync.torproject.org/tor tor-mirror/ </tt>
 
-
 <p>
 Pour Ãtre sÃr d'avoir des miroirs fiables et à jour, merci de veiller que
 votre miroir respecte ce qui suit:<br/><br/> Mises à jour <b>au moins toutes
@@ -62,9 +54,9 @@
 <br/> Pour les opÃrateurs de miroir qui utilisent Apache, nous avons crÃÃ un
 exemple de fichier de configuration d'hÃte virtuel: <tt>
 <pre>
-&lt;VirtualHost 1.2.3.4:80&gt;
+&lt;VirtualHost 0.1.2.3:80&gt;
         ServerAdmin youremail@xxxxxxxxxxx<br/>
-        ServerName  1.2.3.4<br/>
+        ServerName  0.1.2.3<br/>
 
         DocumentRoot /var/www/mirrors/torproject.org<br/>
 
@@ -91,8 +83,6 @@
 miroirs et des problÃmes de configuration sur la liste de diffusion.
 </p>
 
-
-
   </div>
 
 

Modified: website/trunk/fr/tormedia.wml
===================================================================
--- website/trunk/fr/tormedia.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/tormedia.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -146,6 +146,13 @@
 </thead>
 
 <tr>
+<td>2010 May 25</td>
+<td>The Australian</td>
+<td><a
+href="http://www.theaustralian.com.au/australian-it/call-to-join-tor-network-to-fight-censorship/story-e6frgakx-1225870756466";>
+Call to join Tor network to fight censorship</a></td>
+</tr>
+<tr>
 <td>17 mars 2010</td>
 <td>PC World Poland</td>
 <td><a href="http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html";>Anonymity

Modified: website/trunk/fr/volunteer.wml
===================================================================
--- website/trunk/fr/volunteer.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/fr/volunteer.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -42,22 +42,21 @@
 traduction</a> si vous souhaitez le faire. Nous avons besoin plus
 spÃcialement de personnes pour traduire en Arabe ou en Persan pour les
 utilisateurs Tor situÃs dans les zones censurÃes.</li>
-<li>Ãvaluez et documentez <a
-href="https://wiki.torproject.org/wiki/TheOnionRouter/TorifyHOWTO";>notre
-liste de programmes</a> pouvant Ãtre utilisÃs avec Tor.</li>
-<li>Nous avons toute une liste de <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>programmes
-potentiellement utiles qui s'interfacent avec Tor</a>. Lesquels sont utiles
-et dans quelles situations� Contribuez à les tester et à documenter les
-rÃsultats.</li>
+<li>Evaluate and document <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO";>our
+list of programs</a> that can be configured to use Tor.</li>
+<li>We have a huge list of <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>potentially
+useful programs that interface to Tor</a>. Which ones are useful in which
+situations? Please help us test them out and document your results.</li>
 </ol>
 
 <a id="Advocacy"></a>
 <h2><a class="anchor" href="#Advocacy">Plaidoyer</a></h2>
 <ol>
-<li>CrÃer un <a href="https://wiki.torproject.org/noreply/CommunityLogos";>logo
-communautaire</a> sous licence Creative commons que chacun puisse utiliser
-et modifier</li>
+<li>Create a <a
+href="https://trac.torproject.org/projects/tor/wiki/CommunityLogos";>community
+logo</a> under a Creative Commons license that all can use and modify</li>
 <li>CrÃer une prÃsentation qui puisse Ãtre utilisÃe lors des nombreux meetings
 de groupe sur toute la planÃte.</li>
 <li>CrÃer une vidÃo sur les utilisations positives de Tor, sur ce qu'est Tor ou
@@ -731,19 +730,17 @@
 <h2><a class="anchor" href="#OtherCoding">Autres idÃes de spÃcifications et de
 code</a></h2>
 <ol>
-<li>Les serveurs de Tor ne fonctionnent pas parfaitement sur Windows
-XP. SurWindows, Tor utilise l'appel systÃme standard <tt>select()</tt>, qui
-utilise l'espace non paginà dans le pool. Ce qui implique que les serveurs
-de taille moyenne vont vider l'espace non paginÃ, <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/WindowsBufferProblems";>provocant
-l'instabilità et le plantage du systÃme</a>. Nous devrions probablement
-utiliser des E/S recouvrables à la place. Une solution pourrait-Ãtre
-d'apprendre à la <a
-href="http://www.monkey.org/~provos/libevent/";>libevent</a> comment utiliser
-les E/S recouvrables à la place de select() sous Windows, et alors d'adapter
-Tor à la nouvelle interface libevent. Christian King à <a
-href="https://tor-svn.freehaven.net/svn/libevent-urz/trunk/";>bien
-dÃmarrÃ</a> sur ce point l'Ãtà 2007.</li>
+<li>Tor relays don't work well on Windows XP. On Windows, Tor uses the standard
+<tt>select()</tt> system call, which uses space in the non-page pool. This
+means that a medium sized Tor relay will empty the non-page pool, <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/WindowsBufferProblems";>causing
+havoc and system crashes</a>. We should probably be using overlapped IO
+instead. One solution would be to teach <a
+href="http://www.monkey.org/~provos/libevent/";>libevent</a> how to use
+overlapped IO rather than select() on Windows, and then adapt Tor to the new
+libevent interface. Christian King made a <a
+href="https://svn.torproject.org/svn/libevent-urz/trunk/";>good start</a> on
+this in the summer of 2007.</li>
 
 <li>Nous avons besoin maintenant de commencer l'Ãlaboration de notre <a
 href="<page documentation>#DesignDoc">conception de rÃsistance au
@@ -774,17 +771,15 @@
 faire. La cÃlÃbrità pour celui grÃce à qui une nouvelle version pourra voir
 le jourÂ!</li>
 
-<li>Tor utilise TCP pour le transport et TLS pour le chiffrage des liens. C'est
-simple et efficace, mais cela implique que toutes les unitÃs (cellules) d'un
-lien sont mises en attente lorsqu'un seul paquet est perdu, et cela signifie
-que seuls des flux TCP peuvent Ãtre raisonnablement supportÃs. Nous avons
-dressà une <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#TransportIPnotTCP";>
-liste de raisons pour lesquelles nous n'avons pas bifurquà vers le transport
-par UDP</a>, mais ce serait bien de voir cette liste se raccourcir. Nous
-avons aussi proposà <a href="<gitblob>tor/doc/100-tor-spec-udp.txt">une
-spÃcification pour Tor et UDP</a> &mdash; lisez-la et faites-nous part de
-vos remarques et critiques, s'il-vous-plaÃt.</li>
+<li>Tor uses TCP for transport and TLS for link encryption. This is nice and
+simple, but it means all cells on a link are delayed when a single packet
+gets dropped, and it means we can only reasonably support TCP streams. We
+have a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#YoushouldtransportallIPpacketsnotjustTCPpackets.";>list
+of reasons why we haven't shifted to UDP transport</a>, but it would be
+great to see that list get shorter. We also have a proposed <a
+href="<gitblob>doc/spec/proposals/100-tor-spec-udp.txt">specification for
+Tor and UDP</a> &mdash; please let us know what's wrong with it.</li>
 
 <li>Nous ne sommes plus trÃs loin d'avoir le support pour IPV6 entre les
 serveurs de sorties et les adresses finales. Si IPV6 vous tient à cÅur,

Modified: website/trunk/it/index.wml
===================================================================
--- website/trunk/it/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/it/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -65,14 +65,14 @@
 Tor fa e soprattutto quello che non fa</a>.</p>
 
 <p>
-La sicurezza di Tor aumenta quante pià persone lo usano e quanti piÃ
-volontari decidono di <a href="<page docs/tor-doc-relay>">aprire un
-relay</a> (à pià facile di quel che pensi, e puoi <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>aumentare
-notevolmente la tua sicurezza</a>). Oltre ad aprire un relay, ci sono anche
-<a href="<page volunteer>">molti altri modi di contribuire al progetto</a>,
-ed infine servono fondi per rendere la rete Tor pià veloce e facile da
-usare, mantenendo al contempo una buona sicurezza.</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor à una associazione non-profit registrata 501(c)(3) il cui scopo Ã
 fornire agli utenti della rete degli strumenti per impedire l'analisi del

Modified: website/trunk/nl/download.wml
===================================================================
--- website/trunk/nl/download.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/nl/download.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -246,13 +246,14 @@
 </li>
 
 <li>
-Tor anonimiseert de oorsprong van uw dataverkeer, en het versleuteld alles
-tussen u en het Tor netwerk en alles in het Tor netwerk, maar <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>het
-kan niet uw data tussen het Tor netwerk en de uiteindelijke bestemming
-versleutelen</a>. Als u gevoelige informatie communiceert, zou u net zo goed
-moeten opletten als op het normale enge internet &mdash; gebruik HTTPS of
-andere bron-tot-ontvanger versleuteling en authenticatie.
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network, but
+<a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you should
+use as much care as you would on the normal scary Internet &mdash; use HTTPS
+or other end-to-end encryption and authentication.
 </li>
 
 <li>

Modified: website/trunk/nl/index.wml
===================================================================
--- website/trunk/nl/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/nl/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -64,15 +64,14 @@
 voor u doet</a>.</p>
 
 <p>
-De veiligheid van Tor wordt beter als het aantal gebruikers groeit en meer
-mensen vrijwillig <a href="<page docs/tor-doc-relay>">een relay
-draaien</a>.(Het is niet eens zo moeilijk als u denkt, en het kan <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>uw
-eigen beveiliging ook erg verbeteren</a>.) Als een relay draaien niets voor
-u is, hebben we ook nog <a href="<page volunteer>">hulp nodig met veel
-andere aspecten van het project</a>. Ook hebben we hebben geld nodig om door
-te kunnen gaan met het Tor netwerk sneller en makkelijker bruikbaar te maken
-en de beveiliging hoog te houden.</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor is een geregistreerde 501(c)(3) U.S. non-profit, wiens missie het is om
 uw internetverkeer te beschermen tegen analyse. Maakt u alstublieft een <a

Modified: website/trunk/no/bridges.wml
===================================================================
--- website/trunk/no/bridges.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/no/bridges.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -37,16 +37,16 @@
 </p>
 
 <p>
-Ha i mente at det kan ogsà vÃre at Tor ikke fungerer pà grunn av andre
-omstendigheter. Den siste versjonen av <a href="<page torbrowser/index>">Tor
-Nettleser Pakken</a> til Windows prÃver à gi deg bedre rÃd om hvorfor Tor
-har problemer med à koble seg til. Du burde ogsà lese <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>ofte
-stilte spÃrsmÃl for à kjÃre Tor riktig</a> hvis du har problemer. Hvis du
-fÃler at det er uten tvil blokkering, eller du enkelt og greit kun vil
-prÃve, eller er usikker, sà vennligst les videre. VÃr sikker pà at du bruker
-den <a href="<page download>#Dev">nyeste  (0.2.1.x eller 0.2.2.x) pakken for
-din plattform</a>
+Note that it's also possible that Tor is non-functional for other
+reasons. The latest version of <a href="<page torbrowser/index>">The Tor
+Browser Bundle</a> on Windows tries to give you better hints about why Tor
+is having problems connecting. You should also read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>the
+FAQ about problems with running Tor properly</a> when you have issues.  If
+you feel that the issue is clearly blocking, or you'd simply like to try
+because you're unsure or feeling adventurous, please read on. Ensure that
+you're using the <a href="<page download>#Dev">latest 0.2.1.x or 0.2.2.x
+bundle for your platform</a>.
 </p>
 
 <p>
@@ -155,9 +155,9 @@
 docs/tor-doc-relay>">normal Tor relÃ</a>, sà har du muligheten til à kjÃre
 en brorelÃ. Du kan konfigurere det slikt:
 <ul>
-<li> manuelt <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>rediger
-din torrc-fil</a> til kun disse fire linjene:<br />
+<li> manually <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>edit
+your torrc file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -170,10 +170,10 @@
 </ul>
 </p>
 
-<p>Hvis du fÃr opp feilmeldinger som "Could not bind to 0.0.0.0:443: Permission
-denied" trenger du à velge en hÃyere ORPort (f.eks. 8080) eller gjÃre <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>noen
-kompliserte portordninger</a>.
+<p>If you get "Could not bind to 0.0.0.0:443: Permission denied" errors on
+startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>some
+complex port forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/no/documentation.wml
===================================================================
--- website/trunk/no/documentation.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/no/documentation.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -40,35 +40,32 @@
 </li>
 
 <li>
-VÃr side om <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ";>ofte stilte
-spÃrsmÃl</a> dekker alle mulige emner, inkludert spÃrsmÃl om oppsett av
-klient eller relÃ, bekymringer angÃende anonyme angrep, hvorfor vi ikke
-bygde opp Tor anderledes, osv. Det er en separat side om <a href="<page
-faq-abuse>">Ofte stilte spÃrsmÃl ang. misbruk</a> for à gi svar pà vanlige
-spÃrsmÃl fra eller for relÃoperatÃrer. Tor sin side om <a href="<page
-eff/tor-legal-faq>">ofte stilte spÃrsmÃl angÃende lover og regler</a> er
-skrevet av EFF sine advokater, og sikter mot à gi deg innsikt i noen av de
-lovlige aspektene som mÃtte komme fra Tor-prosjektet i USA.
+Our <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>FAQ</a>
+covers all sorts of topics, including questions about setting up a client or
+relay, concerns about anonymity attacks, why we didn't build Tor in other
+ways, etc.  There's a separate <a href="<page faq-abuse>">Abuse FAQ</a> to
+answer common questions from or for relay operators.  The <a href="<page
+eff/tor-legal-faq>">Tor Legal FAQ</a> is written by EFF lawyers, and aims to
+give you an overview of some of the legal issues that arise from the Tor
+project in the US.
 </li>
 
-<li><a href="<page tor-manual>">Tor-manualen</a> gir en liste av alle mulige
-funksjoner du kan legge i din <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>torrc-fil</a>.
-Vi har ogsà en side med <a href="<page tor-manual-dev>">manualen for
-utviklingsversjonen av Tor</a>.</li>
+<li>The <a href="<page tor-manual>">manual</a> lists all the possible entries
+you can put in your <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>torrc
+file</a>. We also provide a <a href="<page tor-manual-dev>">manual for the
+development version of Tor</a>.</li>
 
-<li>Hvis du har spÃrsmÃl sà har vi en IRC-kanal (for brukere, relÃoperatÃrer og
-utviklere) hos <a href="irc://irc.oftc.net/tor">#tor pÃ
-irc.oftc.net</a>. Hvis du har kommet over en feil, spesielt av type som
-krÃsjer programmet, les <a
-href="https://wiki.torproject.org/wiki/TheOnionRouter/TorFAQ#RelayCrashing";>hvordan
-melde inn feil</a> fÃrst og sà fortell oss sà mye informasjon om feilen som
-du kan i <a href="https://bugs.torproject.org/tor";>vÃrt
-feilmeldingssystem</a>. (Hvis feilen din er med Polipo, nettleseren eller
-andre programmet sà vÃr vennlig à ikke legg dem inn i vÃrt
-feilmeldingssystem). <a href="#MailingLists">or-talk e-postlist</a> kan ogsÃ
-vÃre nyttig.
+<li>If you have questions, we have an IRC channel (for users, relay operators,
+and developers)  at <a href="irc://irc.oftc.net/tor">#tor on
+irc.oftc.net</a>. If you have a bug, especially a crash bug, read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#MyTorkeepscrashing.";>how
+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 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>
 
 <li>
@@ -235,12 +232,12 @@
 <a id="NeatLinks"></a>
 <h2><a class="anchor" href="#NeatLinks">Fine lenker</a></h2>
 <ul>
-<li>The <a href="https://wiki.torproject.org/noreply/TheOnionRouter";>Tor
-wiki</a> har en mektig mengde av hjelpfulle bidrag fra Tor-brukere. Sjekk
-det ut nÃ!</li>
+<li>The <a href="https://trac.torproject.org/projects/tor/wiki";>Tor wiki</a>
+provides a plethora of helpful contributions from Tor users. Check it out!</li>
 <li><a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>En
-liste over kompatible program du kanskje vil bruke sammen med Tor</a>.</li>
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>A
+list of supporting programs you might want to use in association with
+Tor</a>.</li>
 <li><a href="https://check.torproject.org/";>Tor detector</a> eller <a
 href="http://torcheck.xenobite.eu/";>den andre Tor detector</a> prÃver Ã
 gjette om du bruker Tor eller ikke.</li>

Modified: website/trunk/no/download.wml
===================================================================
--- website/trunk/no/download.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/no/download.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -247,13 +247,14 @@
 </li>
 
 <li>
-Tor anonymiserer hvor din trafikk stammer fra, og krypterer alt mellom deg
-og Tor-nettverket, og samtidig alt innenfor Tor-nettverket. Men <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>det
-kan ikke kryptere trafikken mellom Tor-nettverket og mÃlet du sender
-trafikken til.</a> Hvis du sender sensitiv informasjon, burde du bruke like
-mye forsiktighet som du ville hvis du hadde brukt internett normalt &mdash;
-med HTTPS eller annen kryptering og autentisering.
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network, but
+<a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you should
+use as much care as you would on the normal scary Internet &mdash; use HTTPS
+or other end-to-end encryption and authentication.
 </li>
 
 <li>

Modified: website/trunk/no/index.wml
===================================================================
--- website/trunk/no/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/no/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -63,15 +63,14 @@
 gjÃr</a>.</p>
 
 <p>
-Tor sin sikkerhet forbedres mens dens brukerbase vokser og flere personer
-stiller opp for à <a href="<page docs/tor-doc-relay>">kjÃre relÃ</a>. (Det
-er ikke i nÃrheten sà vanskelig à sette opp som du mÃtte tro, og det kan <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>
-forbedre din egen sikkerhet</a>.) Hvis det à kjÃre en relà ikke er for deg,
-trenger vi <a href="<page volunteer>">hjelp med mange andre aspekter av
-prosjektet</a>, og vi trenger donasjoner for à fortsette à gjÃre
-Tor-nettverket kjappere og enklere à bruke samtidig som det blir
-vedlikeholdt god sikkerhet.</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor er registrert i 501(c)(3) U.S. non-profit hvis mÃl er à tillate deg Ã
 beskytte din internett-trafikk fra analyse. Vennligst send en <a href="<page

Modified: website/trunk/pl/download.wml
===================================================================
--- website/trunk/pl/download.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/pl/download.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -252,14 +252,14 @@
 </li>
 
 <li>
-Tor anonimizuje ÅrÃdÅo przesyÅanych informacji i szyfruje wszystko miÄdzy
-TobÄ i sieciÄ Tora oraz wewnÄtrz sieci Tora, ale <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>nie
-moÅe szyfrowaÄ danych miÄdzy sieciÄ Tora a punktem docelowym.</a> JeÅli
-wysyÅasz prywatne informacje, powinieneÅ wkÅadaÄ w ich ochronÄ tyle wysiÅku,
-ile normalnie byÅ wkÅadaÅ w normalnym, strasznym internecie &mdash; uÅywaj
-HTTPS lub innego protokoÅu uwierzytelniania i szyfrowania na caÅej drodze
-nadawca-odbiorca.
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network, but
+<a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you should
+use as much care as you would on the normal scary Internet &mdash; use HTTPS
+or other end-to-end encryption and authentication.
 </li>
 
 <li>

Modified: website/trunk/pl/faq-abuse.wml
===================================================================
--- website/trunk/pl/faq-abuse.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/pl/faq-abuse.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -370,25 +370,25 @@
 <a id="RemoveContent"></a>
 <h3><a class="anchor" href="#RemoveContent">ChcÄ, aby usuniÄto jakÄÅ treÅÄ z
 adresu .onion.</a></h3>
-<p>The Tor Project does not host, control, nor have the ability to discover the
-owner or location of a .onion address.  The .onion address is an address
-from <a href="<page hidden-services>">a hidden service</a>.  The name you
-see ending in .onion is a hidden service descriptor.  It's an automatically
-generated name which can be located on any Tor relay or client anywhere on
-the Internet.  Hidden services are designed to protect both the user and
-service provider from discovering who they are and where they are from.  The
-design of hidden services means the owner and location of the .onion site is
-hidden even from us.</p>
+<p>Projekt Tor nie hostuje, nie kontroluje ani nie ma moÅliwoÅci odkrycia
+wÅaÅciciela lub lokalizacji adresu .onion. Adres .onion jest adresem <a
+href="<page docs/tor-hidden-service>">usÅugi ukrytej</a>. Nazwa zakoÅczona
+na .onion, ktÃrÄ widzisz, jest deskryptorem usÅugi ukrytej. Jest to
+generowana automatycznie nazwa, ktÃra moÅe znajdowaÄ siÄ na kaÅdym
+przekaÅniku lub kliencie Tora w dowolnym miejscu Internetu. UsÅugi ukryte sÄ
+zaprojektowane tak, by chroniÄ zarÃwno uÅytkownika, jak i dostawcÄ usÅugi,
+przed odkryciem, kim sÄ i skÄd pochodzÄ. Projekt usÅug ukrytych oznacza, Åe
+wÅaÅciciel i lokalizacja strony .onion jest ukryta nawet przed nami.</p>
 <p>Ale pamiÄtaj, Åe to nie oznacza, Åe usÅugi ukryte nie sÄ podatne na
 ataki. Tradycyjne techniki policyjne mogÄ nadal byÄ przeciwko nim efektywne,
 jak na przykÅad przesÅuchania podejrzanych, pluskwy podsÅuchowe i na
 klawiaturÄ, analiza charakteru pisma, operacje specjalne i inne fizyczne
 Årodki Åledcze.</p>
-<p>If you have a complaint about child pornography, you may wish to report it
-to the National Center for Missing and Exploited Children, which serves as a
-national coordination point for investigation of child pornography: <a
-href="http://www.missingkids.com/";>http://www.missingkids.com/</a>.  We do
-not view links you report.</p>
+<p>JeÅli otrzymaÅeÅ/aÅ skargÄ o dzieciÄcej pornografii, zgÅoÅ jÄ do National
+Center for Missing and Exploited Children, ktÃry jest narodowym punktem
+koordynacji dziaÅaÅ odnoÅnie dzieciÄcej pornografii: <a
+href="http://www.missingkids.com/";>http://www.missingkids.com/</a>. Nie
+oglÄdamy linkÃw, ktÃre zgÅaszasz.</p>
 
 <a id="LegalQuestions"></a>
 <h3><a class="anchor" href="#LegalQuestions">Mam pytania prawne dotyczÄce

Modified: website/trunk/pl/faq.wml
===================================================================
--- website/trunk/pl/faq.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/pl/faq.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -82,10 +82,9 @@
 przekaÅniku wyjÅciowym?</a></li>
 </ul>
 
-<p>JeÅli chcecie poznaÄ odpowiedzi na inne pytania, nie znajdujÄce siÄ jeszcze
-w tej wersji FAQ, spÃjrzcie na razie na <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ";>wiki
-FAQ</a>.</p>
+<p>For other questions not yet on this version of the FAQ, see the <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>wiki
+FAQ</a> for now.</p>
 
 <hr /> <a id="General"></a> <a id="WhatIsTor"></a>
 <h3><a class="anchor" href="#WhatIsTor">Czym jest Tor?</a></h3>
@@ -193,16 +192,15 @@
 </p>
 
 <p>
-Jest wiele innych programÃw, ktÃrych moÅna uÅywaÄ z Torem, ale nie
-zbadaliÅmy problemÃw anonimowoÅci poziomu aplikacji w tych programach doÅÄ
-dobrze, by mÃc poleciÄ bezpiecznÄ konfiguracjÄ. Nasze wiki ma listÄ
-instrukcji <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>toryfikacji
-poszczegÃlnych aplikacji</a>. Jest teÅ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>lista
-aplikacji pomagajÄcych w przekierowaniu ruchu sieciowego przez
-Tora</a>. Prosimy o dodawanie wpisÃw do tej listy i pomaganie nam w
-utrzymaniu jej w zgodnoÅci ze stanem faktycznym!
+There are plenty of other programs you can use with Tor, but we haven't
+researched the application-level anonymity issues on them well enough to be
+able to recommend a safe configuration. Our wiki has a list of instructions
+for <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO";>Torifying
+specific applications</a>. There's also a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>list
+of applications that help you direct your traffic through Tor</a>.  Please
+add to these lists and help us keep them accurate!
 </p>
 
 <hr /> <a id="WhyCalledTor"></a>
@@ -420,13 +418,14 @@
 </li>
 
 <li>
-Jest kilka krokÃw, ktÃre kaÅdy moÅe podjÄÄ, by polepszyÄ wydajnoÅÄ Tora. <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/FireFoxTorPerf";>MoÅesz
-skonfigurowaÄ Firefoksa, by lepiej radziÅ sobie z Torem</a>, <a
-href="http://www.pps.jussieu.fr/~jch/software/polipo/tor.html";>moÅesz uÅywaÄ
-Polipo z Torem</a>, lub sprÃbowaÄ <a href="<page download>">zainstalowaÄ
-najnowszÄ wersjÄ Tora</a>. JeÅli to podziaÅa, pomÃÅ innym, dokumentujÄc, co
-zrobiÅeÅ, i daj nam o tym znaÄ.
+There are some steps that individuals can take to improve their Tor
+performance. <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/FireFoxTorPerf";>You
+can configure your Firefox to handle Tor better</a>, <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/tor.html";>you can use
+Polipo with Tor</a>, or you can try <a href="<page download>">upgrading to
+the latest version of Tor</a>.  If this works well, please help by
+documenting what you did, and letting us know about it.
 </li>
 
 <li>
@@ -718,11 +717,11 @@
 <li>ELE to Linux LiveCD skupione na oprogramowaniu zwiÄzanym z
 prywatnoÅciÄ. Zawiera Tora, a moÅesz go pobraÄ z <a
 href="http://www.northernsecurity.net/download/ele/";>http://www.northernsecurity.net/download/ele/</a>.</li>
-<li>Virtual Privacy Machine to Linux LiveCD zawierajÄce Firefoksa, Privoxy, Tor,
-klika aplikacji do IRC i IM, i zestaw reguÅek ipchains majÄcych na celu
-uniemoÅliwienie danym nie chronionym Torem na opuszczenie Twojego
-komputera. WiÄcej informacji na <a
-href="https://wiki.torproject.org/noreply/VirtualPrivacyMachine";>https://wiki.torproject.org/noreply/VirtualPrivacyMachine</a>.</li>
+<li>Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy,
+Tor, some IRC and IM applications, and a set of ipchains rules aimed to
+prevent non-Tor traffic from accidentally leaving your computer. More
+information at <a
+href="https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine";>https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine</a>.</li>
 <li>Anonym.OS to LiveCD podobne do powyÅszych, ale oparte na OpenBSD zamiast na
 Linuksie, by zapewniÄ maksymalne bezpieczeÅstwo. ZostaÅo zaprojektowane od
 podstaw, by zapewniaÄ anonimowoÅÄ i bezpieczeÅstwo, ma wiÄc kilka cech i
@@ -807,13 +806,12 @@
 </p>
 
 <ul>
-<li>Tor ma wbudowanÄ obsÅugÄ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth";>ograniczania
-przepustowoÅci</a>. Ponadto, jeÅli masz szybkie ÅÄcze, ale chcesz ograniczaÄ
-liczbÄ bajtÃw na dzieÅ (czy tydzieÅ, czy miesiÄc), ktÃre dajesz innym,
-sprawdÅ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Hibernation";>moÅliwoÅÄ
-hibernacji</a>.
+<li>Tor has built-in support for <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#LimitBandwidth";>
+rate limiting</a>. Further, if you have a fast link but want to limit the
+number of bytes per day (or week or month) that you donate, check out the <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Hibernation";>hibernation
+feature</a>.
 </li>
 <li>KaÅdy przekaÅnik Tora ma <a href="#ExitPolicies">politykÄ wyjÅcia</a>, ktÃra
 okreÅla, jakie rodzaje poÅÄczeÅ wychodzÄcych sÄ dozwolone lub zabronione z
@@ -829,11 +827,11 @@
 <li>Dobrze radzimy sobie z przekaÅnikami majÄcymi dynamiczne adresy IP &mdash;
 po prostu zostaw opcjÄ konfiguracji adresu pustÄ, a Tor sprÃbuje zgadnÄÄ.
 </li>
-<li>JeÅli TwÃj przekaÅnik jest za NATem i nie zna swojego publicznego IP (np. ma
-adres IP postaci 192.168.x.y), musisz ustawiÄ przekierowanie
-portÃw. Przekierowywanie poÅÄczeÅ TCP jest zaleÅne od systemu, ale <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>ten
-wpis w FAQ</a> podaje kilka przykÅadÃw, jak to wykonaÄ.
+<li>If your relay is behind a NAT and it doesn't know its public IP (e.g. it has
+an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP
+connections is system dependent but <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>this
+FAQ entry</a> offers some examples on how to do this.
 </li>
 <li>TwÃj przekaÅnik pasywnie oszacuje i ogÅosi swojÄ ostatniÄ przepustowoÅÄ
 ÅÄcza, by przekaÅniki o szerszym ÅÄczu przyciÄgaÅy wiÄcej uÅytkownikÃw, niÅ
@@ -866,20 +864,17 @@
 </p>
 
 <p>
-DomyÅlna polityka wyjÅcia pozwala na dostÄp do wielu popularnych usÅug
-(np. przeglÄdania sieci), ale <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#DefaultPorts";>ogranicza</a>
-niektÃre ze wzglÄdu na moÅliwoÅci naduÅyÄ (np. pocztÄ) i niektÃre, w ktÃrych
-sieÄ Tora nie mogÅaby wytrzymaÄ iloÅci danych (np. domyÅlne porty
-wspÃÅdzielenia plikÃw). MoÅesz zmieniÄ swojÄ politykÄ wyjÅcia z karty
-"Sharing" ("WspÃÅdzielenie") w programie Vidaila lub poprzez rÄcznÄ edycjÄ
-swojego pliku <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>torrc</a>.
-JeÅli chcesz uniknÄÄ wiÄkszoÅci, jeÅli nie caÅoÅci, moÅliwoÅci naduÅyÄ,
-ustaw jÄ na "reject *:*" (lub wyÅÄcz wszystkie opcje w programie
-Vidalia). To ustawienie oznacza, Åe TwÃj przekaÅnik bÄdzie wykorzystywany do
-przekazywania ruchu wewnÄtrz sieci Tora, ale nie do poÅÄczeÅ do zewnÄtrznych
-stron lub innych usÅug.
+The default exit policy allows access to many popular services (e.g. web
+browsing), but <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#DefaultPorts";>restricts</a>
+some due to abuse potential (e.g. mail) and some since the Tor network can't
+handle the load (e.g. default file-sharing ports). You can change your exit
+policy using Vidalia's "Sharing" tab, or by manually editing your <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#torrc";>torrc</a>
+file. If you want to avoid most if not all abuse potential, set it to
+"reject *:*" (or un-check all the boxes in Vidalia). This setting means that
+your relay will be used for relaying traffic inside the Tor network, but not
+for connections to external websites or other services.
 </p>
 
 <p>
@@ -947,11 +942,11 @@
 buffer memory more aggressively</a>. If you update to OpenSSL 1.0.0-beta5,
 Tor's build process will automatically recognize and use this feature.</li>
 
-<li>JeÅli jesteÅ na systemie is, OpenBSD, NetBSD, lub starym FreeBSD, Tor
-prawdopodobnie uruchamia osobne procesy zamiast uÅywaÄ wÄtkÃw. RozwaÅ zmianÄ
-na <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayOS";>lepszy
-system operacyjny</a>.</li>
+<li>If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is
+probably forking separate processes rather than using threads. Consider
+switching to a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayOS";>better
+operating system</a>.</li>
 
 <li>JeÅli dalej nie moÅesz sobie poradziÄ z wykorzystaniem pamiÄci, rozwaÅ
 zmniejszenie przepustowoÅci ÅÄcza, ktÃrÄ zgÅasza TwÃj przekaÅnik. ZgÅaszanie
@@ -1054,17 +1049,16 @@
 uÅytkownik Tora byÅ przekaÅnikiem.</a></h3>
 
 <p>
-Wymaganie, by kaÅdy uÅytkownik Tora byÅ przekaÅnikiem pomogÅoby w skalowaniu
-sieci, by mogÅa obsÅuÅyÄ wszystkich uÅytkownikÃw, a <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>prowadzenie
-przekaÅnika Tora moÅe pomÃc Twojej anonimowoÅci</a>. Jednak wielu
-uÅytkownikÃw Tora nie moÅe byÄ dobrymi przekaÅnikami &mdash; na przykÅad
-czÄÅÄ klientÃw Tora pracuje za restrykcyjnymi zaporami ogniowymi, ÅÄczy siÄ
-przez modem lub w inny sposÃb nie sÄ przystosowane do przekierowywania
-ruchu. Dostarczenie obsÅugi tym klientom jest waÅnÄ czÄÅciÄ dostarczania
-efektywnej anonimowoÅci wszystkim, gdyÅ wielu uÅytkownikÃw Tora podlega tym
-samym lub podobnym ograniczeniom, a doÅÄczenie tych klientÃw zwiÄksza
-rozmiar zbioru anonimowoÅci.
+Requiring every Tor user to be a relay would help with scaling the network
+to handle all our users, and <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>running
+a Tor relay may help your anonymity</a>. However, many Tor users cannot be
+good relays &mdash; for example, some Tor clients operate from behind
+restrictive firewalls, connect via modem, or otherwise aren't in a position
+where they can relay traffic. Providing service to these clients is a
+critical part of providing effective anonymity for everyone, since many Tor
+users are subject to these or similar constraints and including these
+clients increases the size of the anonymity set.
 </p>
 
 <p>
@@ -1091,14 +1085,14 @@
 </p>
 
 <p>
-Po drugie, dalej potrzebujemy poprawienia automatycznego szacowania
-dozwolonej przepustowoÅci ÅÄcza. Przeczytaj punkt 7 w <a href="<page
-volunteer>#Research">sekcji badaÅ na stronie wolontariuszy</a>: "Tor nie
-dziaÅa zbyt dobrze, gdy przekaÅniki majÄ asymetryczne ÅÄcze (np. kablÃwka
-czy DSL)". MoÅliwe, Åe <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#TransportIPnotTCP";>zmiana
-na transport UDP</a> jest najprostszÄ odpowiedziÄ &mdash; co z drugiej
-strony nie jest wcale bardzo prostÄ odpowiedziÄ.
+Second, we still need to get better at automatically estimating the right
+amount of bandwidth to allow. See item #7 on the <a href="<page
+volunteer>#Research">research section of the volunteer page</a>: "Tor
+doesn't work very well when relays have asymmetric bandwidth (e.g. cable or
+DSL)". It might be that <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#TransportIPnotTCP";>switching
+to UDP transport</a> is the simplest answer here &mdash; which alas is not a
+very simple answer at all.
 </p>
 
 <p>
@@ -1152,9 +1146,9 @@
 Internetu o moim przekaÅniku wyjÅciowym?</a></h3>
 
 <p>
-Zestaw szablonÃw dobrych odpowiedzi dostawcom internetu zostaÅ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";>zebrany
-tutaj</a>.
+A collection of templates for successfully responding to ISPs is <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorAbuseTemplates";>collected
+here</a>.
 </p>
 
 <hr />

Modified: website/trunk/pl/index.wml
===================================================================
--- website/trunk/pl/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/pl/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -65,16 +65,14 @@
 nie</a>.</p>
 
 <p>
-BezpieczeÅstwo Tora wzrasta wraz z rosnÄcÄ liczbÄ wolontariuszy <a
-href="<page docs/tor-doc-relay>">uruchamiajÄcych przekaÅniki
-sieciowe</a>. (Nie jest to nawet po czÄÅci tak trudne, jak myÅlisz, a moÅesz
-znacznie <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>powiÄkszyÄ
-TwojÄ wÅasnÄ ochronÄ</a>.) JeÅli uwaÅasz, Åe uruchomienie wÅasnego
-przkaÅnika sieciowego nie jest dla Ciebie, potrzebujemy <a href="<page
-volunteer>">pomocy w wielu innych aspektach projektu</a>, oraz potrzebujemy
-funduszy, by kontynuowaÄ sprawianie, Åe sieÄ Tora bÄdzie szybsza i
-Åatwiejsza w uÅytku, zachowujÄc dobrÄ ochronÄ.</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor jest zarejestrowanÄ organizacjÄ non-profit 501(c)(3) w USA, ktÃrej
 zadaniem jest danie Tobie moÅliwoÅci ochrony Twoich dziaÅaÅ sieciowych przed

Modified: website/trunk/pl/research.wml
===================================================================
--- website/trunk/pl/research.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/pl/research.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -1,24 +1,174 @@
+
+
+
+
+
+
 ## translation metadata
-# Based-On-Revision: 18524
+# Revision: $Revision$
 # Translation-Priority: 4-optional
-# Last-Translator: bogdandr_at_op . pl
-
-#include "head.wmi" TITLE="Tor: Badania" CHARSET="UTF-8"
-
+#include "head.wmi" TITLE="Tor: Research" CHARSET="UTF-8"
 <div class="main-column">
 
 <h2>Tor: Badania</h2>
 <hr />
 
-<p>Przeczytaj <a
-href="http://freehaven.net/anonbib/topic.html#Anonymous_20communication";>te
-dokumenty</a> (zwÅaszcza te w ramkach), by szybko nabraÄ pojÄcia o
-systemach anonimowej komunikacji.</p>
+<p>
+Wiele osÃb na caÅym Åwiecie prowadzi badania, jak polepszyÄ projekt Tora, co
+dzieje siÄ w sieci Tora i ogÃlnie o atkach i obronie anonimowych systemÃw
+komunikacji. Ta strona podsumowuje zasoby, ktÃre dajemy, by Twoje badanie
+Tora byÅo bardziej efektywne. Najlepszym sposobem na kontakt z nami jest
+lista <a href="<page contact>">tor-assistants</a>.
+</p>
 
-<p>Potrzebujemy ludzi do ataku na system, rozbijania ochrony itd.
- Zobacz dziaÅ "Badania" ("Research") na stronie
-<a href="<page volunteer>#Research">wolontariuszy</a>.</p>
+<ul>
 
-  </div><!-- #main -->
+<li>
+<b>Dane.</b> <a href="http://metrics.torproject.org/data.html";>Zabieramy
+dane, by dowiedzieÄ siÄ wiÄcej o sieci Tora</a>: ile w sieci jest
+przekaÅnikÃw i klientÃw, jakie majÄ moÅliwoÅci, jak szybka jest sieÄ, ilu
+klientÃw ÅÄczy siÄ przez mostki, jaki ruch wychodzi z sieci, etc. Rozwijamy
+teÅ narzÄdzia, by przetwarzaÄ te ogromne archiwa danych i otrzymaliÅmy <a
+href="http://metrics.torproject.org/graphs.html";>uÅyteczne
+statystyki</a>. Na przykÅad, dajemy <a
+href="https://gitweb.torproject.org//ernie.git?a=blob_plain;f=doc/manual.pdf";>narzÄdzie
+o nazwie Ernie</a>, ktÃre moÅe importowaÄ deskryptory przekaÅnikÃw do
+lokalnej bazy danych, by dokonaÄ analizy. Dajcie nam znaÄ, jakie jeszcze
+informacje chcielibyÅcie zobaczyÄ, a moÅemy z Wami popracowaÄ, by zebraÄ je
+<a href="http://metrics.torproject.org/papers/wecsr10.pdf";>bezpiecznie</a> i
+pewnie.
+</li>
 
+<li>
+<b>Analiza.</b> JeÅli badacie Tora lub rozwiÄzujecie problem zwiÄzany z
+Torem, <i>_prosimy_</i> z nami porozmawiaÄ w trakcie dziaÅania &mdash; im
+wczeÅniej, tym lepiej. Otrzymujemy teraz wiele wysÅanych dokumentÃw na
+konferencje, ktÃre czyniÄ zÅe zaÅoÅenia i rozwiÄzujÄ zÅe problemy. Jako Åe
+protokÃÅ Tora i sieÄ Tora sÄ ruchomymi celami, mierzenie bez zrozumienia, co
+siÄ dzieje, spowoduje wyciÄgniÄcie zÅych wnioskÃw. W szczegÃlnoÅci, rÃÅne
+grupy nieÅwiadomie prowadzÄ rÃwnolegle rÃÅne eksperymenty, a w tym samym
+czasie my ciÄgle zmieniamy projekt, by wyprÃbowaÄ nowe podejÅcia. JeÅli
+powiecie nam, co robicie i czego chcecie siÄ dowiedzieÄ, pomoÅemy Wam
+zrozumieÄ, jakich innych zmiennych oczekiwaÄ i jak interpretowaÄ wyniki.
+</li>
+
+<li>
+<b>NarzÄdzia do pomiarÃw i atakÃw.</b> Budujemy <a
+href="http://metrics.torproject.org/tools.html";>repozytorium</a> narzÄdzi,
+ktÃre mogÄ byÄ uÅyte do mierzenia, analizy lub przeprowadzenia atakÃw na
+Tora. Wiele grup potrzebuje wykonaÄ podobne pomiary (na przykÅad, zmieniÄ
+projekt Tora w jakiÅ sposÃb i sprawdziÄ, czy czas siÄ poprawi), a my mamy
+nadziejÄ, Åe uda nam siÄ pomÃc wszystkie w ustandaryzowaniu siÄ na kilku
+narzÄdziach, po czym uczynieniu ich naprawdÄ dobrymi. Poza tym, podczas gdy
+jest trochÄ naprawdÄ interesujÄcych atakÃw na Tora, o ktÃrych ludzie pisali,
+trudno jest znaleÅÄ kopiÄ kodu, ktÃrego uÅywali. Dajcie nam znaÄ, jeÅli
+macie nowe narzÄdzia, ktÃre powinniÅmy umieÅciÄ na liÅcie, lub ulepszenia
+istniejÄcych narzÄdzi. Na tym etapie im wiÄcej, tym lepiej.
+</li>
+
+<li>
+<b>Potrzebujemy teÅ ÅrodkÃw ochrony &mdash; nie tylko atakÃw.</b> Dla wielu
+badaczy fajnie i Åatwo jest wymyÅliÄ nowy atak na systemy
+anonimowoÅci. ZobaczyliÅmy to ostatnio w ulepszonych atakach z zatorami,
+atakach opierajacych siÄ na zdalnym pomiarze czasu lub przepustowoÅci i tak
+dalej.WaÅne jest wiedzieÄ, jak coÅ moÅe Åle zadziaÅaÄ, a my wiemy, Åe bodÅce
+w akademiach nie ÅÄczÄ siÄ z wykorzystywaniem energii na projektowanie
+obrony, ale byÅoby wspaniale, gdyby moÅna byÅo poÅwiÄciÄ wiÄcej uwagi na to,
+jak zajÄÄ siÄ tymi atakami. Z przyjemnoÅciÄ pomoÅemy w burzy mÃzgÃw na temat
+jak poprawiÄ Tora. Jako bonus, Wasz dokument moÅe zyskaÄ lepszÄ sekcjÄ
+"Årodki przeciwdziaÅania".
+</li>
+
+<li>
+<b>Osobista pomoc.</b> JeÅli prowadzicie intersujÄce i waÅne badania Tora i
+potrzebujecie pomocy w zrozumieniu, jak dziaÅa sieÄ lub projekt Tora,
+interpretacji danych, polepszeniu swoich eksperymentÃw etc, moÅemy przysÅaÄ
+Wam badacza Tora. Jak moÅecie siÄ spodziewaÄ, nie mamy wiele wolnego czasu;
+ale upewnienie siÄ, Åe badania sÄ prowadzone w uÅyteczny dla nas sposÃb jest
+naprawdÄ waÅne. Tak wiÄc, dajcie nam znaÄ, a my coÅ wymyÅlimy.
+</li>
+
+</ul>
+
+<a id="Groups"></a>
+<h2><a class="anchor" href="#Groups">Research Groups</a></h2>
+
+<p>Chcecie znaleÅÄ innych badaczy anonimowoÅci? Oto kilka grup badawczych,
+ktÃrym powinniÅcie siÄ przyjrzeÄ.</p>
+
+<ul>
+<li>Grupa <a href="http://crysp.uwaterloo.ca/";>CrySP</a> Iana Goldberga w
+Waterloo.
+</li>
+<li>Grupa <a href="http://www-users.cs.umn.edu/~hopper/";>Nicka Hoppera</a> w
+UMN.
+</li>
+<li>Grupa <a href="http://www.hatswitch.org/~nikita/";>Nikity Borisova</a> w
+Illinois.
+</li>
+<li>Grupa <a href="http://isec.uta.edu/";>iSec</a> Matta Wrighta w UTA.
+</li>
+</ul>
+
+<a id="Ideas"></a>
+<h2><a class="anchor" href="#Ideas">PomysÅy na Badania</a></h2>
+
+<p>
+JeÅli interesujÄ Was badania anonimowoÅci, musicie byÄ na <a
+href="http://petsymposium.org/";>Privacy Enhancing Technologies
+Symposium</a>. BÄdzie tam kaÅdy, kto jest kimÅ w Åwiecie badania
+anonimowoÅci. Konferencja w 2010 bÄdzie w Berlinie w lipcu. Stypendia sÄ
+dostÄpne dla osÃb, ktÃrych obecnoÅÄ bÄdzie miaÅa zysk dla spoÅeczeÅstwa.
+</p>
+
+<p>By szybko nabraÄ wiedzy o badaniu anonimowoÅci, przeczytajcie <a
+href="http://freehaven.net/anonbib/";>te dokumenty</a> (zwÅaszcza te w
+ramkach).</p>
+
+<p>We need people to attack the system, quantify defenses, etc. Here are some
+example projects:</p>
+
+<ul>
+
+<li>"Atak na odciski palcÃw stron WWW" (website fingerprinting attack): sporzÄdÅ
+listÄ kilkuset popularnych stron WWW, ÅciÄgnij ich strony i zrÃb listÄ
+"podpisÃw" dla kaÅdej z nich. Potem obserwuj ruch sieciowy klienta Tora. Jak
+patrzysz na odbierane przez niego dane, szybko zgadujesz, ktÃrÄ (jeÅli w
+ogÃle) on odbiera. Po pierwsze, jak bardzo ten atak jest efektywny?
+Problemem we wszystkich poprzednich dokumentach o ataku jest to, Åe patrzÄ
+one na czasy i liczÄ pakiety IP w transmisji. Ale rekordy TLS w OpenSSL i
+uÅywanie przez Tora odsyÅania TCP do ograniczania przepustowoÅci oznaczajÄ,
+Åe Åledzenie poprzez pakiety IP daje bardzo sÅabe wyniki. PrawidÅowym
+podejÅciem jest zdanie sobie sprawy, Åe Tor uÅywa OpenSSL, spojrzenie do
+Årodka rekordu TLS do nagÅÃwkÃw TLS i dowiedzenie siÄ, ile 512-bajtowych
+komÃrek jest wysyÅanych lub odbieranych. Potem zacznij badaÄ sposoby obrony:
+na przykÅad, moglibyÅmy zmieniÄ rozmiar komÃrki Tora z 512 na 1024 bajty,
+moglibyÅmy uÅyÄ technik dopeÅniajÄcych, jak <a
+href="http://freehaven.net/anonbib/#timing-fc2004";>odrzucanie obronne
+(defensive dropping)</a>, lub moglibyÅmy dodaÄ opÃÅnienia w ruchu. Jak
+wielki wpÅyw majÄ te rozwiÄzania i jak wielki wpÅyw na uÅywalnoÅÄ (uÅywajÄc
+odpowiedniego sposobu mierzenia) ma udana obrona w kaÅdym z przypadkÃw?</li>
+
+
+
+<!--
+<li>
+
+Path selection algorithms, directory fetching schedules for Tor-on-mobile
+that are compatible anonymity-wise with our current approaches.
+</li>
+
+<li>
+Figure out how bad 10 minutes is for maxcircuitdirtiness.
+</li>
+-->
+<li>More coming soon. See also the "Research" section of the <a href="<page
+volunteer>#Research">volunteer</a> page for other topics.
+</li>
+
+</ul>
+
+  </div>
+
+
 #include <foot.wmi>

Modified: website/trunk/pl/running-a-mirror.wml
===================================================================
--- website/trunk/pl/running-a-mirror.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/pl/running-a-mirror.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -13,24 +13,17 @@
 <h2>Tor: Prowadzenie Mirrora</h2>
 <hr />
 
-<p>DziÄkujemy, Åe chcesz mirrorowaÄ strony Tora. Wszystkie nasze
-serwery-mirrory sÄ publicznie wypisane na <a href="<page mirrors>">naszej
-stronie mirrorÃw</a>. PoniÅej zamieszczamy kilka przykÅadowych komend i
-konfiguracji, by wstÄpne uruchamianie i utrzymywanie odbywaÅy siÄ jak
-najmniejszym wysiÅkiem. Strona Tora i katalog dystrybucyjny w chwili obecnej
-wymagajÄ 1,6 GB miejsca na dysku. Sam katalog /dist zajmuje 230 MB.</p>
+<p>Thank you for wanting to mirror the Tor website.  All of our mirrors are
+publicly listed on <a href="<page mirrors>">our mirrors page</a>.  We've
+included some sample commands and configuration below to make the initial
+setup and ongoing maintenance a minimal effort.  The Tor website and
+distribution directory currently require 5.0 GB of disk space.</p>
 
 <p>
-JeÅli chcielibyÅcie poprowadziÄ mirror (strona+dist), wystarczy po prostu ta
-komenda, by pobraÄ wszystko, czym mirror powinien dzieliÄ siÄ ze Åwiatem:
-<br /> <br /> <tt> rsync -av --delete rsync://rsync.torproject.org/tor
-tor-mirror/ </tt> <br/> <br/> JeÅli chcielibyÅcie prowadziÄ tylko mirror
-samego katalogu dist/ (tylko dystrybucje), wystarczy ta komenda, by pobraÄ
-wszystko, czym taki mirror powinien dzieliÄ siÄ ze Åwiatem: <br /> <br />
-<tt> rsync -av --delete rsync://rsync.torproject.org/tor/dist
-tor-mirror-dist/ </tt>
+If you would like to run a mirror, it's as easy as this command to download
+everything a mirror should share with the world: <br /> <br /> <tt> rsync
+-av --delete rsync://rsync.torproject.org/tor tor-mirror/ </tt>
 
-
 <p>
 W celu zapewnienia, Åe mamy wiarygodne i aktualne mirrory, prosimy upewniÄ
 siÄ, Åe TwÃj mirror wykonuje co najmniej nastÄpujÄce rzeczy:<br /><br />
@@ -60,9 +53,9 @@
 <br/> Dla tych operatorÃw mirrorÃw, ktÃrzy uÅywajÄ Apache, stworzyliÅmy
 przykÅadowy plik konfiguracji wirtualnego hosta: <tt>
 <pre>
-&lt;VirtualHost 1.2.3.4:80&gt;
+&lt;VirtualHost 0.1.2.3:80&gt;
         ServerAdmin youremail@xxxxxxxxxxx<br/>
-        ServerName  1.2.3.4<br/>
+        ServerName  0.1.2.3<br/>
 
         DocumentRoot /var/www/mirrors/torproject.org<br/>
 
@@ -88,8 +81,6 @@
 konfiguracjÄ.
 </p>
 
-
-
   </div>
 
 

Modified: website/trunk/pl/tormedia.wml
===================================================================
--- website/trunk/pl/tormedia.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/pl/tormedia.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -145,6 +145,13 @@
 </thead>
 
 <tr>
+<td>2010 May 25</td>
+<td>The Australian</td>
+<td><a
+href="http://www.theaustralian.com.au/australian-it/call-to-join-tor-network-to-fight-censorship/story-e6frgakx-1225870756466";>
+Call to join Tor network to fight censorship</a></td>
+</tr>
+<tr>
 <td>2010 Mar 17</td>
 <td>PC World Poland</td>
 <td><a href="http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html";>AnonimowoÅÄ

Modified: website/trunk/pl/volunteer.wml
===================================================================
--- website/trunk/pl/volunteer.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/pl/volunteer.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -40,22 +40,21 @@
 href="<page translation>">wskazÃwki do tÅumaczenia</a>, jeÅli chcesz
 pomÃc. Potrzebujemy zwÅaszcza tÅumaczy na jÄzyk arabski i Farsi dla wielu
 uÅytkownikÃw Tora w cenzorowanych obszarach.</li>
-<li>Przejrzyj i udokumentuj <a
-href="https://wiki.torproject.org/wiki/TheOnionRouter/TorifyHOWTO";>naszÄ
-listÄ programÃw</a>, ktÃre moÅna skonfigurowaÄ do wspÃÅpracy z Torem.</li>
-<li>Mamy ogromnÄ listÄ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>potencjalnie
-uÅytecznych programÃw, ktÃre wspÃÅpracujÄ z Torem</a>. KtÃre z nich sÄ
-przydatne w jakich sytuacjach? Prosimy pomÃÅ nam je testowaÄ i zapisuj swoje
-wyniki.</li>
+<li>Evaluate and document <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO";>our
+list of programs</a> that can be configured to use Tor.</li>
+<li>We have a huge list of <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>potentially
+useful programs that interface to Tor</a>. Which ones are useful in which
+situations? Please help us test them out and document your results.</li>
 </ol>
 
 <a id="Advocacy"></a>
 <h2><a class="anchor" href="#Advocacy">Pokazanie siÄ jako zwolennik Tora</a></h2>
 <ol>
-<li>StwÃrz <a href="https://wiki.torproject.org/noreply/CommunityLogos";>logo
-spoÅecznoÅci</a> pod licencjÄ Creative Commons, ktÃrego wszyscy bÄdÄ mogli
-uÅywaÄ i modyfikowaÄ</li>
+<li>Create a <a
+href="https://trac.torproject.org/projects/tor/wiki/CommunityLogos";>community
+logo</a> under a Creative Commons license that all can use and modify</li>
 <li>StwÃrz prezentacjÄ, ktÃrej bÄdzie moÅna uÅywaÄ na spotkaniach rÃÅnych grup
 na caÅym Åwiecie</li>
 <li>StwÃrz film o Twoim pozytywnym wykorzystaniu Tora, czym jest Tor lub jak go
@@ -736,18 +735,17 @@
 <h2><a class="anchor" href="#OtherCoding">Inne pomysÅy zwiÄzane z programowaniem
 i projektowaniem</a></h2>
 <ol>
-<li>PrzekaÅniki sieci Tora nie dziaÅajÄ zbyt dobrze na Windows XP. Pod systemem
-Windows Tor uÅywa standardowej funkcji systemowej <tt>select()</tt>, ktÃra
-zuÅywa miejsce w niestronicowanym obszarze pamiÄci. Znaczy to, Åe Årednich
-rozmiarÃw przekaÅnik sieci Tora zapeÅni dostÄpnÄ przestrzeÅ, <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/WindowsBufferProblems";>bÄdÄc
-przyczynÄ dziwnych zachowaÅ i padÃw systemu</a>. PowinniÅmy raczej uÅywaÄ
-nakÅadajÄcego IO. Jednym z rozwiÄzaÅ byÅoby nauczenie biblioteki <a
-href="http://www.monkey.org/~provos/libevent/";>libevent</a>, jak uÅywaÄ
-nakÅadajÄcego IO zamiast select() pod Windows, po czym zaadaptowaÄ Tora do
-nowego interfejsu. Christian King zrobiÅ <a
-href="https://svn.torproject.org/svn/libevent-urz/trunk/";>pierwszy dobry
-krok</a> latem roku 2007.</li>
+<li>Tor relays don't work well on Windows XP. On Windows, Tor uses the standard
+<tt>select()</tt> system call, which uses space in the non-page pool. This
+means that a medium sized Tor relay will empty the non-page pool, <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/WindowsBufferProblems";>causing
+havoc and system crashes</a>. We should probably be using overlapped IO
+instead. One solution would be to teach <a
+href="http://www.monkey.org/~provos/libevent/";>libevent</a> how to use
+overlapped IO rather than select() on Windows, and then adapt Tor to the new
+libevent interface. Christian King made a <a
+href="https://svn.torproject.org/svn/libevent-urz/trunk/";>good start</a> on
+this in the summer of 2007.</li>
 
 <li>Musimy zaczÄÄ budowaÄ nasz <a href="<page documentation>#DesignDoc">projekt
 odporny na blokowanie</a>. Wchodzi w to przemyÅlenie projektu, zmiana wielu
@@ -776,15 +774,15 @@
 istniejÄ jakieÅ dobre biblioteki "fuzz", ktÃrych nam potrzeba. ZdobÄdÅ sÅawÄ
 gdy wydamy nowÄ wersjÄ dziÄki Tobie!</li>
 
-<li>Tor uÅywa TCP do transportu i TLS do szyfrowania transmisji. To jest Åadne i
-proste, ale oznacza to, Åe wszystkie komÃrki na ÅÄczu zostajÄ opÃÅnione, gdy
-pojedynczy pakiet zostanie utracony, co oznacza, Åe rozsÄdnie obsÅugiwaÄ
-moÅemy tylko strumienie TCP. Mamy <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#TransportIPnotTCP";>listÄ
-powodÃw, dla ktÃrych nie przenieÅliÅmy siÄ na UDP</a>, ale byÅoby dobrze
-skrÃciÄ tÄ listÄ. Mamy teÅ proponowanÄ <a
-href="<gitblob>doc/spec/proposals/100-tor-spec-udp.txt">specyfikacjÄ dla
-Tora i UDP</a> &mdash; proszÄ daÄ znaÄ, co z niÄ jest nie tak.</li>
+<li>Tor uses TCP for transport and TLS for link encryption. This is nice and
+simple, but it means all cells on a link are delayed when a single packet
+gets dropped, and it means we can only reasonably support TCP streams. We
+have a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#YoushouldtransportallIPpacketsnotjustTCPpackets.";>list
+of reasons why we haven't shifted to UDP transport</a>, but it would be
+great to see that list get shorter. We also have a proposed <a
+href="<gitblob>doc/spec/proposals/100-tor-spec-udp.txt">specification for
+Tor and UDP</a> &mdash; please let us know what's wrong with it.</li>
 
 <li>JesteÅmy wcale niedaleko od obsÅugi adresÃw IPv6 jako docelowych (na wÄzÅach
 wyjÅciowych). JeÅli mocno ci zaleÅy na IPv6, to jest to chyba najlepszy

Modified: website/trunk/ru/bridges.wml
===================================================================
--- website/trunk/ru/bridges.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/ru/bridges.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -39,19 +39,16 @@
 </p>
 
 <p>
-ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÑÐÑ ÑÐÐÑ, ÑÑÐ ÑÑÑÐÑÑÐÑÑÑ Ð ÐÑÑÐÐÐ ÐÑÐÑÐÐÑ, ÐÐ ÐÐÑÐÑÑÐ
-Tor ÐÐÐÐÑ ÐÐ ÑÐÐÐÑÐÑÑ. Ð ÑÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ <a href="<page
-torbrowser/index>">The Tor Browser Bundle</a> ÐÐÑ ÐÐÐÑÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÑ
-Windows ÐÑÑÑ ÑÑÐÐÑÐÑ ÐÐÐÑÐÐÐÐÐ, ÐÐÑÐÑÐÑ ÐÑÐÐÐÐÐÐÐÑÐÐÐ ÐÐÑ ÐÐÑÐÐÑÐÐÐ
-ÐÐÐÐÐÐÑÑÐÐÐ Ð ÐÑÐÑÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐÑ. ÐÑÐÐ ÐÑ ÐÑÐÑÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑ Ñ
-ÐÐÑÑÑÐÐÐÐÐ ÐÑÐÐÑÐÐÐÑ Tor, ÐÑ ÑÐÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÑÑ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>ÐÐÐÑÐÐ
-ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ (FAQ) Ð ÐÑÐÐÐÐÐÐÑ Ñ ÐÐÑÑÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÑ
-Tor</a>. ÐÑÐÐ ÐÑ ÑÑÐÑÐÐÑÐ, ÑÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÑÑÑ ÐÐÐÐÐÐ Ð ÐÐÐÐÐÑÐÐÐÐÐÐ,
-ÐÐÐ ÐÐÐ ÐÑÐÑÑÐ ÐÐÑÐÑÐÑÐÐ ÐÐÐÑÐÐÐÐÐÑÑ, ÐÐÐÐÐÑÐÑÑÐ, ÐÐÐÑÑÐÑÐ ÑÑÐÐÑÐÑ
-ÐÐÑÑÐÐ. ÐÑÐÐÐÐÑÐÑÐÐÑÐÐ ÑÐÐÐÐÑÐÑÑ, ÑÑÐ ÐÑ ÐÑÐÐÐÑÐÑÐÑÐ <a href="<page
-download>#Dev">ÑÐÐÑÑ ÐÐÑÐÐÐÐÑÑ ÐÐÑÑÐÑ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÑ ÐÐÑÐÐ
-ÐÐÐÑÑÐÑÐÑ.</a>.
+Note that it's also possible that Tor is non-functional for other
+reasons. The latest version of <a href="<page torbrowser/index>">The Tor
+Browser Bundle</a> on Windows tries to give you better hints about why Tor
+is having problems connecting. You should also read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>the
+FAQ about problems with running Tor properly</a> when you have issues.  If
+you feel that the issue is clearly blocking, or you'd simply like to try
+because you're unsure or feeling adventurous, please read on. Ensure that
+you're using the <a href="<page download>#Dev">latest 0.2.1.x or 0.2.2.x
+bundle for your platform</a>.
 </p>
 
 <p>
@@ -166,9 +163,9 @@
 docs/tor-doc-relay>">ÑÑÐÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÑÐÑÑÐÑ Tor</a>, ÐÐÐ ÑÑÐÐÑ ÐÐÑÑÑÐÐÑÑ
 ÑÐÑÑÐÐÑÐÑÑÐÑ ÑÐÐÐ ÐÐÑÑ. ÐÐÑÑÑÐÐÑÑ ÐÐÐ ÐÐÐÐÐ ÑÐÐÐÑÑÑÐÐÐ ÑÐÐÑÐÐÐÐÐ:
 <ul>
-<li> ÐÑÑÑÐÑÑ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>ÐÑÑÐÐÐÐÑÐÑÐÐÐÐ
-ÐÐÑ torrc  ÑÐÐÐ</a>, ÑÑÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÑÐÐÑÐÐ ÑÑÐ ÑÐÑÑÑÐ ÐÐÐÐÐ:<br />
+<li> manually <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>edit
+your torrc file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -181,11 +178,10 @@
 </ul>
 </p>
 
-<p>ÐÑÐÐ ÐÑ ÐÐÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐ "ÐÐ ÐÐÐÑ ÑÐÑÐÐÑÑÑÑ Ñ 0.0.0.0:443: Ð
-ÑÐÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐ" ÐÑÐ ÐÐÐÑÑÐÐ, ÐÐÐ ÐÑÐÐÐ ÐÑÐÑÐÑÑ ÐÐÐÐÐ ÐÑÑÐÐÐÐ ORPort
-(ÐÐÐÑÐÐÐÑ, 8080) ÐÐÐ ÑÑÑÐÐÐÐÐÑÑ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>ÐÐÐÐÐÐÐÑÐÑÑ
-ÐÐÑÐÐÐÑÐÑÐÑÐÑ ÐÐÑÑÐÐ</a>.
+<p>If you get "Could not bind to 0.0.0.0:443: Permission denied" errors on
+startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>some
+complex port forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/ru/contact.wml
===================================================================
--- website/trunk/ru/contact.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/ru/contact.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -40,11 +40,10 @@
 <li><tt>tor-ops</tt> ÑÑÐ ÐÑÐÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑÑÑÑ ÑÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÐ.  ÐÐÑÐÑÐ
 ÑÑÐÐ ÐÑÐÐ ÐÑ ÐÐÐÑÑÑÐÐÐ ÑÐÑÐÐÑ Tor Ð Ñ ÐÐÑ ÐÑÑÑ ÐÐÐÑÐÑ ÐÐÐ ÐÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐ
 ÑÐÑÐÐÑÐÐ.</li>
-<li><tt>tor-webmaster</tt> ÐÐÐÐÑ ÐÑÐÑÐÐÐÑÑ ÐÐÐÑÐÑÐÐ ÐÐ ÑÐÐÑÐ, ÐÑÑÐÐÐÐÑÐÑÐÐÐÑÑ
-ÐÐÐÐÑÐÑÐ ÑÑÐÐÑÐÐÐÐÐÑ ÐÐÐ ÑÐÐÐÑÑ ÐÐ ÑÐÐÑÐ, ÐÐÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐ
-ÐÐÑÐÐÑÐÑÑ ÐÐÑÐÑÑÐ ÐÑ ÐÑÐÑÐÑÑÐ. ÐÑ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÑÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐ
-ÑÐÐÑÐÐ ÐÐ <a href="https://wiki.torproject.org/noreply/TheOnionRouter";>Tor
-wiki</a> ÑÐÐÑÐÐÐ.</li>
+<li><tt>tor-webmaster</tt> can fix typos on the website, change wrong statements
+or directions on the website, and add new sections and paragraphs that you
+send us. You might want to make a draft of your new sections on <a
+href="https://trac.torproject.org/projects/tor/wiki";>the Tor wiki</a> first.</li>
 <li><tt>tor-volunteer</tt> ÐÑÐÐÑ ÑÐÐ ÑÑÐÑÑÐÑÑ Ð ÐÐÑÐÑ ÐÐÐÑÐÐÐÑÐÑ, ÐÐÑÑÐÑ,
 ÑÐÑÑÐÑÐÐÐÐÐÐ, ÐÐÑÑÐ ÐÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ, ÐÑÐ ÐÐÑÐÑ ÐÐÐÑÐÐÐÑÑ ÐÐ <a
 href="<page volunteer>">ÑÑÑÐÐÐÑÐ ÐÐÐÑÐÐÐÐÑÑÐÐ</a> (ÐÐÐ Ð ÐÑÑÐÐÑ ÐÑÐÐÐÐÐÐÑ

Modified: website/trunk/ru/documentation.wml
===================================================================
--- website/trunk/ru/documentation.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/ru/documentation.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -40,35 +40,32 @@
 </li>
 
 <li>
-ÐÐÑ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ";>ÐÐÐÑÐÐ
-ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ (FAQ)</a> ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÑÑÐÐ ÑÐÐÐÐÐÐÑÐÐÐÑÑ ÑÐÐ,
-ÐÐÐÑÑÐÑ ÐÐÑÑÑÐÐÐÑ ÐÐÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐ, ÐÐÐÑÐÑÑ ÐÑÐÐ, ÐÐÐÑÐÐÐÐÐÐÑÑ
-ÐÑÐÑÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÐÑÑÐ, ÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÑÐÐÐÑ Ð ÐÑÐÑÐÐÐÑ ÐÑÐÐÑÐ ÐÐÐÐÐÐ
-ÑÑÑÑÐÑÑÑÑ ÐÐÑ Tor, Ð ÐÑÐÑÐÐ. ÐÐÐÑÐÐÐÑÐÑÐ <a href="<page faq-abuse>">ÐÐÐÑÐÐ
-ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑÑÐÐÐÐÐÐÑ ÑÐÑÑÑ Tor (FAQ Abuse)</a>
-ÐÑÐÐÑÐÐÑ ÐÐ ÑÐÐÐÑÐÑÐ ÐÐÐÑÐÑÑ ÐÐÐÑÐÑÐÑÐÐ ÑÐÐÐÐ Tor. <a href="<page
-eff/tor-legal-faq>">ÐÐÐÑÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ ÐÐ ÑÑÐÐÐÑÐÑÐÐÐ ÐÑÐÐÐÑÐÐ
-ÑÐÐÐÑÑ ÑÐÑÐ Tor (Legal FAQ)</a> ÑÐÑÑÐÐÐÐÐ ÑÑÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐÐ EFF Ñ ÑÐÐÑÑ
-ÐÑÐÐÐÑÑÐÐÐÑÑ ÐÐÐÐÑ ÑÑÐÐÐÑÐÑÐÐÑ ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐÑÑÐÑ Ð ÑÐÑÐÐ Ñ ÐÑÐÐÐÑÐÐ Tor Ð
-ÐÐÐ.
+Our <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>FAQ</a>
+covers all sorts of topics, including questions about setting up a client or
+relay, concerns about anonymity attacks, why we didn't build Tor in other
+ways, etc.  There's a separate <a href="<page faq-abuse>">Abuse FAQ</a> to
+answer common questions from or for relay operators.  The <a href="<page
+eff/tor-legal-faq>">Tor Legal FAQ</a> is written by EFF lawyers, and aims to
+give you an overview of some of the legal issues that arise from the Tor
+project in the US.
 </li>
 
-<li>Ð <a href="<page tor-manual>">ÐÑÐÐÐÐÐÑÑÐÐ</a> ÐÐÑÐÑÐÑÐÐÐÑ ÐÑÐ ÐÐÐÐÐÐÐÑÐ
-ÐÐÑÑÑÐÐÐÐ, ÐÐÑÐÑÑÐ ÐÐÐÐÐ ÑÐÐÐÐÑÑ Ð <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>ÑÐÐÐÐ
-torrc</a>. ÐÐÐÐÐ ÐÐÑÑÑÐÐÐ <a href="<page tor-manual-dev>">ÐÑÐÐÐÐÐÑÑÐÐ ÐÐ
-ÑÐÐÑÐÐÐÑÑÐÐÐÐÐÐ Ð ÐÐÐÐÐÐ ÐÑÐÐÑ ÐÐÑÑÐÐ Tor</a>.</li>
+<li>The <a href="<page tor-manual>">manual</a> lists all the possible entries
+you can put in your <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>torrc
+file</a>. We also provide a <a href="<page tor-manual-dev>">manual for the
+development version of Tor</a>.</li>
 
-<li>ÐÑÐÐ Ñ ÐÐÑ ÐÑÑÑ ÐÐÐÑÐÑÑ, Ñ ÐÐÑ ÐÑÑÑ IRC ÐÐÐÐÐ (ÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ, ÐÐÐÑÐÑÐÑÐÐ
-ÑÐÐÐÐ, Ð ÑÐÐÑÐÐÐÑÑÐÐÐÐ) <a href="irc://irc.oftc.net/tor">#tor ÐÐ
-irc.oftc.net</a>. ÐÑÐÐ ÐÑ ÐÐÑÐÐ ÐÐÐ, ÐÑÐÐÐÐÐÐ ÑÐÑÐÐÑÐÑÐ, ÐÑÐÑÐÑÐÐÑÐ <a
-href="https://wiki.torproject.org/wiki/TheOnionRouter/TorFAQ#RelayCrashing";>ÐÐÐ
-ÑÐÐÐÑÐÑÑ Ð ÐÐÐÐÑ Tor</a> ÑÐÐÑÐÐÐ, Ð ÐÐÑÐÐ ÐÑÐÐÐÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐ
-ÑÑÐÐ ÐÐÐÐ ÐÐ <a href="https://bugs.torproject.org/tor";>ÐÐÐÑÑÐÐÐÑ</a>. (ÐÑÐÐ
-ÐÐÐ ÐÐÑÐÐÑÑÑ Privoxy, ÐÐÑÐÐÐ ÐÑÐÑÐÐÑÐ, ÐÐÐ ÐÑÐÐÐÐ ÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ,
-ÐÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÐÐÑÐÐÑÐ Ð ÐÑÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ.). <a
-href="#MailingLists">ÐÐÐÑÐÐ ÑÐÑÑÑÐÐÐ or-talk</a> ÑÐÐÐÐ ÐÐÐÐÑ ÐÑÐÐÐÐÐÑÑÑÑ. 
+<li>If you have questions, we have an IRC channel (for users, relay operators,
+and developers)  at <a href="irc://irc.oftc.net/tor">#tor on
+irc.oftc.net</a>. If you have a bug, especially a crash bug, read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#MyTorkeepscrashing.";>how
+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 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>
 
 <li>
@@ -237,12 +234,11 @@
 <a id="NeatLinks"></a>
 <h2><a class="anchor" href="#NeatLinks">ÐÐÐÐÐÐÑÐ ÑÑÑÐÐÐ</a></h2>
 <ul>
-<li>ÐÐÐÐÐÑÑÐÐ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐ ÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ Tor ÐÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter";>Tor
-wiki</a>. ÐÐÐÐÐÐÐÑÑÐÑÑ!</li>
+<li>The <a href="https://trac.torproject.org/projects/tor/wiki";>Tor wiki</a>
+provides a plethora of helpful contributions from Tor users. Check it out!</li>
 <li><a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>ÐÐÐÑÐÐ
-ÐÐÐÐÐÑÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐ, ÐÐÑÐÑÑÐ ÐÑ, ÐÐÐÐÐÐÐÐ, ÐÐÑÐÑÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ Ñ
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>A
+list of supporting programs you might want to use in association with
 Tor</a>.</li>
 <li><a href="https://check.torproject.org/";>Tor ÐÐÑÐÐÑÐÑ 1</a> Ð <a
 href="http://torcheck.xenobite.eu/";>Tor ÐÐÑÐÐÑÐÑ 2</a> ÐÐÐÐÐÑÑ ÐÐÐ

Modified: website/trunk/ru/download.wml
===================================================================
--- website/trunk/ru/download.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/ru/download.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -256,14 +256,14 @@
 </li>
 
 <li>
-ÐÐÑÐÐÑ Tor ÐÐÐÐÐÐÐÐÐÑÑÐÑ ÐÑÐÐÑÑÐÐÐÐÐÐÐ ÐÐÑÐÐÐ ÑÑÐÑÐÐÐ Ð ÐÐÐÐÑÑÐÑ
-ÐÐÑÐÑÐÐÑÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑ ÐÐÐÐ Ð ÑÐÑÑÑ Tor, Ð ÑÐÐÐÐ ÐÐÑÑÑÐ ÑÐÑÐ Tor, ÐÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>ÐÐ
-ÐÐ ÐÐÐÐÑ ÐÐÑÐÑÑÐÐÐÑÑ ÐÐÑ ÑÑÐÑÐÐ ÐÐÐÐÑ ÑÐÑÑÑ Tor Ð ÐÑÐÐÑÐÐ ÐÐÐÐÐÑÐÐÐÑ
-(ÐÐÐÑÐÐÐÑ, ÐÐÐ-ÑÐÐÑÐÐ).</a> Ð ÑÐÑÑÐÐ, ÐÑÐÐ ÐÑ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÑÑ
-ÐÐÑÐÑÐÐÑÐÑ ÑÐÑÐÐ Tor, ÐÐÐ ÑÑÐÐÑ ÑÐÐÐÑÑÑ ÑÑÐÐÑ ÐÐÐÑÐÑÑ ÑÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÑ,
-ÐÐÐ ÐÑÐÐ ÐÑ ÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÐÑÑÐÐÐÑ, HTTPS ÐÐÐ ÐÑÑÐÑÑ
-ÑÐÐÐÐÐÐÐÐÐÑÑÑ ÑÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐÐÑ Ð ÐÑÑÐÐÑÐÑÐÐÐÑÐÐ.
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network, but
+<a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you should
+use as much care as you would on the normal scary Internet &mdash; use HTTPS
+or other end-to-end encryption and authentication.
 </li>
 
 <li>

Modified: website/trunk/ru/faq.wml
===================================================================
--- website/trunk/ru/faq.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/ru/faq.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -88,10 +88,9 @@
 ÐÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐ?</a></li>
 </ul>
 
-<p>ÐÐ ÐÑÐÐ ÐÑÑÐÐÐ ÐÐÐÑÐÑÐÐ, ÐÐ ÐÑÑÐÐÐÐÐÑÐ Ð ÑÑÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ
-ÐÐÐÑÐÑÐÐ (FAQ), ÐÐÐÐÐÑÐÑÑÐ, ÐÐÑÐÑÐÑÐÑÑ Ð <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ";>ÐÐÑÐÑÐÐÐÐÐ
-wiki FAQ</a>.</p>
+<p>For other questions not yet on this version of the FAQ, see the <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>wiki
+FAQ</a> for now.</p>
 
 <hr /> <a id="General"></a> <a id="WhatIsTor"></a>
 <h3><a class="anchor" href="#WhatIsTor">ÐÑÐ ÑÐÐÐÐ Tor?</a></h3>
@@ -209,16 +208,15 @@
 </p>
 
 <p>
-ÐÑÑÐÑÑÐÑÐÑ ÐÐÑÑÐ ÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐ, ÐÐÑÐÑÑÐ ÐÑ ÐÐÐÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ Ñ Tor, ÐÐ
-ÐÑ ÐÐ ÐÑÑÐÐÐÐÐÐÐÐ ÐÐÐÑÐÑÑ ÐÐÐÐÐÐÐÐÑÑÐ ÑÑÐÐÐÑ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑ ÐÐÑ Ð
-ÐÐÑÑÐÑÐÑÐÐÐ ÐÐÑÐ, ÑÑÐÐÑ ÑÐÐÐÐÐÐÐÐÐÐÑÑ ÐÑ  ÐÐÐÐÐÐÑÐÑÑ ÐÐÐÑÐÐÑÑÐÑÐÑ. ÐÐÑÐ
-ÑÑÑÐÐÐÑÐÐ ÐÐÐÐ ÑÐÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÐÑÑÑÑÐÑÐÐ ÐÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>ÂÐÐÑÐÑÐÐÐÑÐÐÂ
-ÐÐÐÐÑÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐ</a>. ÐÑÑÑ ÑÐÐ ÑÐÐÐÐ Ð <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>ÑÐÐÑÐÐ
-ÐÑÐÐÐÐÐÐÐÐ, ÐÐÑÐÑÑÐ ÐÐÐÑÑ ÐÐÐÐÑÑ ÐÐÐ ÐÐÐÑÐÐÐÑÑ ÐÐÑ ÑÑÐÑÐÐ ÑÐÑÐÐ
-Tor</a>. ÐÐÐÐÐÑÐÑÑÐ, ÐÐÐÐÐÐÑÐÑÐ ÑÑÐÑ ÑÐÐÑÐÐ Ð ÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐÐ
-ÐÐÑÑÐÐÑÐÐÑÑÑ!
+There are plenty of other programs you can use with Tor, but we haven't
+researched the application-level anonymity issues on them well enough to be
+able to recommend a safe configuration. Our wiki has a list of instructions
+for <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO";>Torifying
+specific applications</a>. There's also a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>list
+of applications that help you direct your traffic through Tor</a>.  Please
+add to these lists and help us keep them accurate!
 </p>
 
 <hr /> <a id="WhyCalledTor"></a>
@@ -452,16 +450,14 @@
 </li>
 
 <li>
-ÐÑÑÐÑÑÐÑÐÑ ÐÐÑÐÐÐÑÐÐ ÑÐÐÐÐ, ÐÐÑÑÑÐÐÑÑ ÐÐÐÐÐÐÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑÐ, ÐÐÑÐÑÑÐ
-ÐÐÐÑÑ ÑÐÑÑÑÐÑÑ ÐÑÐÐÐÐÐÐÐÑÐÐÑÐÐÑÑÑ Tor. <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/FireFoxTorPerf";>ÐÑ
-ÐÐÐÐÑÐ ÐÐÑÑÑÐÐÑÑ ÑÐÐÐ ÐÐÐ ÐÑÐÑÐÐÑ Firefox ÐÐ ÐÐÑÐÐÐÐÑÐÑÑ ÑÐÐÐÑÑ Ñ Tor</a>,
-<a href="http://www.pps.jussieu.fr/~jch/software/polipo/tor.html";>ÐÑ ÐÐÐÐÑÐ
-ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ Polipo Ñ Tor</a>, Ð/ÐÐÐ <a href="<page download>">ÐÑ
-ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÑÑ ÐÑÐÐÑÐÐÐÑ Tor ÐÐ ÐÐÑÐÐÐÐÐÐ
-ÐÐÑÑÐÐ</a>. ÐÑÐÐ ÑÑÐ ÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÑÐÑÑÑÐÑÑ ÐÑÐÐÐÐÐÐÐÑÐÐÑÐÐÑÑÑ ÑÐÑÐ Tor,
-ÐÐÐÐÐÑÐÑÑÐ, ÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐÑÐÑ ÐÐ ÐÑÐÐÑÐÐÐÐÐÐÑ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÑÐÐ ÐÐÑÑÐÐ
-Ð ÑÐÐÐÑÐÑÐ ÐÐ ÑÑÐÐ ÐÐÐ.
+There are some steps that individuals can take to improve their Tor
+performance. <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/FireFoxTorPerf";>You
+can configure your Firefox to handle Tor better</a>, <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/tor.html";>you can use
+Polipo with Tor</a>, or you can try <a href="<page download>">upgrading to
+the latest version of Tor</a>.  If this works well, please help by
+documenting what you did, and letting us know about it.
 </li>
 
 <li>
@@ -778,13 +774,11 @@
 ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÐÑÑÐ. Ð ÐÐÐ ÑÐÑÑÐÐ ÐÑÐÐÐÑ Tor Ð ÐÑ ÐÐÐÐÑÐ ÑÐÐÑÐÑÑ ÐÐÐ ÐÐÐÑÑ:
 <a
 href="http://www.northernsecurity.net/download/ele/";>http://www.northernsecurity.net/download/ele/</a>.</li>
-<li>ÐÐÑÑÑÐÐÑÐÐÑ ÐÐÑÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÐÑÑÐ (Virtual Privacy Machine) â ÑÑÐ Linux
-ÐÐÑÐ LiveCD, Ð ÑÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÑÑ Firefox, Privoxy, Tor, ÐÐÐÐÑÐÑÑÐ IRC
-ÐÑÐÐÑÐÐÐÑ Ð IM ÐÑÐÐÐÐÐÐÐÑ, Ð ÑÐÐÐÐ ÐÐÐÐÑ ÐÑÐÐÐÐ ipchains, ÐÐÐÐÑÐÐÐÐÑÑ ÐÐÑ
-ÐÐÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÐÑÑÐÑÑ (ÐÐ ÑÐÑÐÐ Tor) Ñ ÐÐÑÐÐÐ ÐÐÐÐÑÑÑÐÑÐ
-ÐÐÐÐÑÐÑÑÐÐÐÐÐÑÑ ÐÐÐÐÑÑ. ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ, ÐÐÐÐÐÑÐÑÑÐ,
-ÐÐÑÐÑÐÑÐÑÑ Ð <a
-href="https://wiki.torproject.org/noreply/VirtualPrivacyMachine";>https://wiki.torproject.org/noreply/VirtualPrivacyMachine</a>.</li>
+<li>Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy,
+Tor, some IRC and IM applications, and a set of ipchains rules aimed to
+prevent non-Tor traffic from accidentally leaving your computer. More
+information at <a
+href="https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine";>https://trac.torproject.org/projects/tor/wiki/VirtualPrivacyMachine</a>.</li>
 <li>Anonym.OS â ÑÑÐ ÐÐÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐÐÐÑÐÐÐÐÐÑ ÐÐÑÐ LiveCD. ÐÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐÐÑÑÑ
 Ð ÑÐÐ, ÑÑÐ ÑÑÐÑ ÐÑÐÐÑÐÑ ÐÑÐÐÐÐÐ ÐÐ OpenBSD, Ð ÐÐ ÐÐ Linux ÐÐÑ ÐÐÐÑÐÐÑÐÐÐÑ
 ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ. ÐÑÐ ÐÐÐ ÑÐÐÑÐÐÐÑÐÐ ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑÑ
@@ -873,13 +867,12 @@
 </p>
 
 <ul>
-<li>ÐÐÐÐÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐÐ Tor ÐÐÐÐÑ ÐÑÑÑÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÑ ÐÐÑ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth";>ÐÐÑÐÐÐÑÐÐÐÑ
-ÑÐÐÑÐÑÑÐ</a>. ÐÐÐÐÐ ÑÐÐÐ, ÐÑÐÐ ÐÑ ÐÐÐÐÑÐ ÑÐÐÑÐÑÑÐÐÐ ÐÐÐÐÐÑÑÐÐÐÐ, ÐÐ ÑÐÑÐÑÐ
-ÐÐÑÐÐÐÑÐÑÑ ÑÐÑÐÐ ÐÐÐÑÐÐ ÐÑÐÐÑÑÐÐÐÐÑÑ ÑÐÑÐÐ ÐÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑ Ð ÐÐÐÑ (ÐÐÐÐÐÑ
-ÐÐÐ ÐÐÑÑÑ), ÐÐÑÐÑÐÑÐÑÑ Ð <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Hibernation";>ÑÑÐÐÑÐÐ
-ÐÐÐÐÑÐÐÑÐÐ</a>.
+<li>Tor has built-in support for <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#LimitBandwidth";>
+rate limiting</a>. Further, if you have a fast link but want to limit the
+number of bytes per day (or week or month) that you donate, check out the <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Hibernation";>hibernation
+feature</a>.
 </li>
 <li>ÐÐÐÐÑÐ ÑÐÑÑÐÐÑÐÑÑÐÑ Tor ÐÐÐÐÑ <a href="#ExitPolicies">ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ</a>,
 ÐÐÑÐÑÑÐ ÑÑÑÐÐÐÐÐÐÐÐÑÑ ÑÐÐÑÐÑÐÐÐÑÐ Ð ÐÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐÐÐÑ ÑÑÐÐÐ
@@ -896,13 +889,11 @@
 ÑÐÐÐÑ ÑÐÑÑÐÑÑ ÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÐ ÐÑÐÑÑÐ ÐÑÑÐÐÐÑÑÑ Address config ÐÑÑÑÑÐ, Ð
 Tor ÐÐÐÑÑÐÐÑÑÑ ÐÐÑÐÐÐÐÐÑÑ ÐÐÑÐÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐ.
 </li>
-<li>ÐÑÐÐ ÐÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑ ÑÐÐÐÑÐÐÑ ÑÐÑÐÐ ÐÑÐÑÐÐÐÐ NAT (ÐÑÐÑÐÐÐÐ ÑÑÐÐÑÐÑÑÐÐ
-ÑÐÑÐÐÑÑ ÐÐÑÐÑÐÐ) Ð ÐÑÐÐÐÑÐÑÐ IP ÐÐ ÐÐÐÐÑÑÐÐ (ÐÐÐÑÐÐÐÑ, ÐÑÐÐ IP ÐÐÑÐÑ -
-192.168.x.y), ÐÐÐ ÐÐÐÐÐÐÐÐÑÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÑ ÐÐÑÑÐÐ. ÐÐÑÐÐÐÑÐÑÐÑÐÑ
-ÑÐÐÐÐÐÐÐÐÐ TCP ÐÐÐÐÑ ÑÐÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐÐÑÑÐ, ÐÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewal
-ledClients">ÑÑÐÑ ÑÐÐÑÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ (FAQ)</a> ÐÑÐÐÐÐÐÐÐÑ
-ÐÐÑÐÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑÑÐÐÐÐ ÑÑÐÐ ÑÑÐÐÑÐÐ.
+<li>If your relay is behind a NAT and it doesn't know its public IP (e.g. it has
+an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding TCP
+connections is system dependent but <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>this
+FAQ entry</a> offers some examples on how to do this.
 </li>
 <li>ÐÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑ ÐÑÐÐÑ ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐÑÑ, Ð ÐÐÑÐÐÐÐÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐÐÐ
 ÑÐÐÑÑÐÐ ÐÐÑÐÐÑÐÐÐÐ ÐÐÐÐÑÑ ÐÑÐÐÑÑÐÐÐÐÑ, ÑÐÐÐÐ ÐÐÑÐÐÐÐ, ÐÑÑÐÐÐÑÐÐÑÐÑÑÐÑÐ
@@ -937,20 +928,17 @@
 </p>
 
 <p>
-ÐÑÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ ÑÐÐÑÐÑÐÑÑ ÐÐÑÑÑÐ Ð ÐÐÐÐÐÑÑÐÑ ÐÐÐÑÐÑÑÐÑÑ ÑÐÑÐÐÑÐÐ
-(ÐÐÐÑÐÐÐÑ, ÐÑÐÑÐÐÑÑ ÐÐÐ ÑÑÑÐÐÐÑ), ÐÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#DefaultPorts";>ÐÐÑÐÐÐÑÐÐÐÑÑ</a>
-ÐÐÐÐÑÐÑÑÐ ÑÐÑÐÐÑÑ Ð ÑÐÑÐÐ Ñ ÐÐÑÐÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÑÑÐÐÐÐÐÐÐÐ
-(ÐÐÐÑÐÐÐÑ, ÐÐÑÑÐÐÑÐ ÑÐÑÐÐÑÑ) Ð ÐÑÑÐÐÐ ÑÐÑÐÐÑÑ, ÑÐÑÐÐÐÐÑÐ Ñ ÐÐÑÐÐÐÑÐÐÐÐÑÑÑÑ
-ÐÐÐÐÐÐÐÐÑÑÐÐ ÑÐÑÐ Tor (ÐÐÐÑÐÐÐÑ, ÐÐÐÑÑÑ ÐÐÑÑÑÐ Ð ÑÑÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ
-ÑÐÐÐÐÐÐÐÐÐÐ). ÐÑ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÑ ÑÐÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ, ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÐÑ
-"Sharing" ÐÑÐÐÑÐÐÐÑ Vidalia, ÐÐÐ ÐÑÑÐÐÐÐÑÐÑÐÐÐÐ ÐÑÑÑÐÑÑ ÑÐÐÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>torrc</a>.
-ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÐÐÐÐÐÐÑÑ ÐÐÐÑÑÐÐÑÑÐÐ (ÐÑÐÐ ÐÐ ÐÑÐÑ) ÐÐÐÐÐÐÐÑÑ
-ÐÐÐÑÐÐÑÑÐÐÐÐÐÐÐ, ÐÐÐÑÐÑÐ Ð ÑÑÐÑ ÑÐÐÐ ÑÑÑÐÐÑ "reject *:*" (ÐÐÐ ÑÐÐÑÐÑÐ
-ÐÐÐÐÑÐÐ ÑÐ ÐÑÐÑ ÐÑÐÐÑÐÐ Ð ÐÑÐÐÑÐÐÐÐ Vidalia). ÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÑÑ, ÑÑÐ
-ÐÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑ ÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑ ÐÐÑÐÑÑÐÐÐ ÑÑÐÑÐÐÐ ÐÐÑÑÑÐ ÑÐÑÐ
-Tor, ÐÐ ÐÐ ÐÐÑ ÐÐÐÐÐÑÑÐÐÐÐ Ð ÐÐÐÑÐÐÐ ÐÐÐ ÑÐÐÑÐÐ ÐÐÐ ÐÑÑÐÐÐ ÑÐÑÐÐÑÐÐ.
+The default exit policy allows access to many popular services (e.g. web
+browsing), but <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#DefaultPorts";>restricts</a>
+some due to abuse potential (e.g. mail) and some since the Tor network can't
+handle the load (e.g. default file-sharing ports). You can change your exit
+policy using Vidalia's "Sharing" tab, or by manually editing your <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#torrc";>torrc</a>
+file. If you want to avoid most if not all abuse potential, set it to
+"reject *:*" (or un-check all the boxes in Vidalia). This setting means that
+your relay will be used for relaying traffic inside the Tor network, but not
+for connections to external websites or other services.
 </p>
 
 <p>
@@ -1025,11 +1013,11 @@
 buffer memory more aggressively</a>. If you update to OpenSSL 1.0.0-beta5,
 Tor's build process will automatically recognize and use this feature.</li>
 
-<li>ÐÑÐÐ ÐÑ ÐÑÐÐÐÑÐÑÐÑÐ Solaris, OpenBSD, NetBSD, ÐÐÐ ÑÑÐÑÑÐ FreeBSD, Tor
-ÐÐÑÐÑÑÐÐ ÑÐÐÐÐÐÑ ÐÑÐÐÐÑÐÑÐ ÐÑÐÑÐÑÑÑ, ÐÐÐÑÑÐ ÐÑÐÐÐÑÐÐÐÐÐÐÑ
-ÐÐÑÐÐÐÐ. ÐÐÑÑÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÐÐÐÐÐÐÑ Ð <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayOS";>ÐÑÑÑÐÐ
-ÐÐÐÑÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐ</a>.</li>
+<li>If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is
+probably forking separate processes rather than using threads. Consider
+switching to a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayOS";>better
+operating system</a>.</li>
 
 <li>ÐÑÐÐ ÐÑ ÐÑÐ ÐÑÐ ÐÐ ÐÐÐÐÑ ÑÐÑÐÐÐÑÑÑÑ Ñ ÐÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÐ ÑÐÐÐÐ
 ÑÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÑÐÐÑÐÑ. ÐÐÑÑÐÐÑÑ ÐÐÐÑÑÐÐ ÐÑÐÐÑÑÐÐÐÐ
@@ -1136,19 +1124,16 @@
 Tor ÑÐÑÑÐÐÑÐÑÑÐÑÐÐ.</a></h3>
 
 <p>
-ÐÑÐÐ ÐÑ ÐÑ ÑÑÐÐÐÐÐÐÐ ÐÑ ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ Tor ÐÑÐÐÐÑÑÐÐÐÐÐÐÑ ÑÑÐÑÐ
-ÑÐÑÑÐÐÑÐÑÑÐÐ, ÑÑÐ ÐÐÐÐÐÐÐ ÐÑ ÐÐÐ ÑÐÐÐÐÑÐÑÑ ÐÐÑÑÑÐÐ ÑÐÑÐ Ð ÐÐÐÐ ÐÑ
-ÐÐÐÐÐÐÐÐÑÑÑ ÑÐÐÐÐÐÑÐÐÑÑÑÑ ÐÐÑÑÐÐÐÐÑÑÐ ÐÑÐÑ ÐÐÑÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ. ÐÐÐÐÐ ÑÐÐÐ,
-<a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>ÐÐÐÐÑÐÐ
-ÑÐÑÑÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÑÐÐÑ ÑÑÐÐÐÐÑ ÐÐÐÐÐÐÐÐÑÑÐ</a>. ÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐ
-Tor ÐÐ ÐÐÐÑÑ ÐÑÑÑ ÐÐÐÐÐÑÐÐÐÑÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐÐÐ â ÐÐÐÑÐÐÐÑ, ÐÐÐÐÑÐÑÑÐ ÐÐÐÐÐÑÑ
-Tor ÑÐÐÐÑÐÑÑ Ð ÑÑÐÐÐÐÑÑ ÐÐÑÐÐÐÑÐÐÐÑÑÐÑ ÐÑÐÐÐÐÐÑÑÑÐÐ, ÐÐÐÐÐÑÑÐÑÑÑÑ Ñ ÐÐÐÐÑÑÑ
-ÐÐÐÐÐÐ (dial-up), ÐÐÐ ÐÐ ÐÐ ÐÐÐÑÑ ÑÐÑÑÐÐÑÐÐÑÐÐÐÑÑ ÑÑÐÑÐÐ. ÐÑÐÐÐÑÑÐÐÐÐÐÐÐ
-ÑÑÐÑÐ ÑÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑÐ ÑÐÐÑÐÑÑÑ ÐÑÐÑÐÑÐÑÐÐÐ ÑÐÑÑÑÑ ÐÑÐÐÐÑÑÐÐÐÐÐÐÑ
-ÑÑÑÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÑÐ ÐÐÑ ÐÐÐÐÐÐÐ, ÑÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐ Tor
-ÑÐÐÑÑÑÑÑ ÑÑÐÑÐÐÑÐÐÐ ÑÐÐÐÑ ÐÐ, ÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÐÐÐÐ Ð ÑÐÐÐÑÐ Ñ ÑÐÐÐÐÐ
-ÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐÑÐÐÐÐÑ ÐÐÑ ÐÐÑÐÐÑÐÐÐ.
+Requiring every Tor user to be a relay would help with scaling the network
+to handle all our users, and <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>running
+a Tor relay may help your anonymity</a>. However, many Tor users cannot be
+good relays &mdash; for example, some Tor clients operate from behind
+restrictive firewalls, connect via modem, or otherwise aren't in a position
+where they can relay traffic. Providing service to these clients is a
+critical part of providing effective anonymity for everyone, since many Tor
+users are subject to these or similar constraints and including these
+clients increases the size of the anonymity set.
 </p>
 
 <p>
@@ -1176,14 +1161,14 @@
 </p>
 
 <p>
-ÐÐ-ÐÑÐÑÑÑ, ÐÑ ÐÐÐÐÐÑ ÑÐÑÑÑÐÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÑÑ ÐÑÐÐÐÑ ÐÐÑÑÐÑÐÑÐÐÐ ÐÑÐÐÑÑÐÐÐÐ
-ÑÐÐÑÐÐÐÐÑÑÐ. ÐÐÐÑÑÐ ÐÑÐÐÑ #7 Ð <a href="<page volunteer>#Research">ÑÐÐÐÐÐÐ
-ÐÑÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÑÐÐÐ ÑÑÑÐÐÐÑÑ</a>: "Tor ÐÐ ÐÑÐÐÑ ÑÐÑÐÑÐ ÑÐÐÐÑÐÐÑ Ð
-ÐÐÑÐÑÑÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐ ÐÐ ÐÑÑÐÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑ ÑÐÐÐÐÐÐÐÐÐ (ÐÐÐÑÐÐÐÑ,
-ÐÐÐÐÐÑ ÐÐÐ DSL)". ÐÐÐÐÐÐÐÐ,  <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#TransportIPnotTCP";>ÐÐÑÐÑÐÐ
-ÐÐ UDP</a> - ÑÑÐ ÑÐÐÑÐ ÐÑÐÑÑÐÐ ÐÐÑÐÐÐÑ ÑÐÑÐÐÐÑ ÐÑÐÐÐÐÐÑ â ÐÐ, ÑÐÑ, ÑÑÐ
-ÐÐÐÐÐÐ ÐÐ ÐÑÐÑÑÐÐ ÑÐÑÐÐÐÐ.
+Second, we still need to get better at automatically estimating the right
+amount of bandwidth to allow. See item #7 on the <a href="<page
+volunteer>#Research">research section of the volunteer page</a>: "Tor
+doesn't work very well when relays have asymmetric bandwidth (e.g. cable or
+DSL)". It might be that <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#TransportIPnotTCP";>switching
+to UDP transport</a> is the simplest answer here &mdash; which alas is not a
+very simple answer at all.
 </p>
 
 <p>
@@ -1240,9 +1225,9 @@
 ÐÐÑÐÑÐÐÑ ÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐ?</a></h3>
 
 <p>
-ÐÐÐÐÐÐÑÐÑ ÐÑÐÐÐÑÐÐ ÐÐÑ ÑÑÐÐÑÐÐÐÐ ÐÑÐÐÑÐ ÐÐ ÐÐÐÑÐÑÑ ÐÑÐÐÐÐÐÐÑÐÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorAbuseTemplates";>ÑÐÐÑÐÐÐ
-ÐÐÐÑÑ</a>.
+A collection of templates for successfully responding to ISPs is <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorAbuseTemplates";>collected
+here</a>.
 </p>
 
 <hr />

Modified: website/trunk/ru/hidden-services.wml
===================================================================
--- website/trunk/ru/hidden-services.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/ru/hidden-services.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -114,16 +114,16 @@
 </p>
 
 <p>
-Ð ÑÑÐÑ ÐÐÐÐÐÑ ÐÑÐÐÑ ÐÐÐÐÐ, ÑÑÐ ÑÐÑÑÑÑÐ ÑÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÑÑÑ ÐÐÐÐÑÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#EntryGuards";>ÐÑÐÐÐÐÐ
-ÐÐÑÐÑÑ</a>, ÐÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐÐ. Ð ÐÑÐÑÐÐÐÐÐ ÑÐÑÑÐÐ,
-ÐÐÑÑÑÐÑÐÐÑ ÑÐÐÐ ÐÑ ÐÐÐÑÑÑÐÑÑ ÑÐÐÐ ÑÐÐÑÑÐÐÐÐÑÐ ÑÐÑÑÐÐÑÐÑÑÐÑ Ð ÐÐÑÑÐÐÐÑÑ
-ÑÐÑÑÑÑÐ ÑÐÑÐÐÑ ÑÐÐÐÐÑÑ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐ ÑÐÐÐÐ Ð ÐÐÐÐÐÐÐ ÐÐ ÑÐ, ÑÑÐ
-ÐÐÐÐÑÐ ÑÐÑÑÐÐÑÐÑÑÐÑ ÐÑÐÐÑ ÐÐÑÐÑÐÐÑÑ ÐÐÐ ÐÑÐÐÐÐÐ ÑÐÐÐ Ð ÑÐÐÐÐ ÐÐÑÐÐÐÐ, ÑÐÑÐÐ
-ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐÑ IP-ÐÐÑÐÑ ÑÐÑÑÑÐÐÐ ÑÐÑÐÐÑÐ. ÐÐÐÐÑ ÐÑÐÐÐ ÐÑÐÐ
-ÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÐÐÐ Ð ÐÑ ÑÐÐÐÑÐ <a
-href="http://freehaven.net/anonbib/#hs-attack06";>ÐÐÑÐÐÐÐÐÐÐÐÐ ÐÐÑÑÑÑÑ
-ÐÐÑÐÐÑÐÐ</a>.
+At this point it is of special importance that the hidden service sticks to
+the same set of <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Whatsthisaboutentryguardformerlyknownashelpernodes";>entry
+guards</a> when creating new circuits. Otherwise an attacker could run his
+own relay and force a hidden service to create an arbitrary number of
+circuits in the hope that the corrupt relay is picked as entry node and he
+learns the hidden server's IP address via timing analysis. This attack was
+described by &Oslash;verlier and Syverson in their paper titled <a
+href="http://freehaven.net/anonbib/#hs-attack06";>Locating Hidden
+Servers</a>.
 </p>
 
 # it should say "Bob connects to Alice's ..."

Modified: website/trunk/ru/index.wml
===================================================================
--- website/trunk/ru/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/ru/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -68,17 +68,14 @@
 download>#Warning">ÐÐÐÐÐÐÑÑ ÑÑÐ Tor ÐÐÐÐÐÑ ÐÐÑ ÐÐÑ, Ð ÑÑÐ ÐÐÑ</a>.</p>
 
 <p>
-ÐÐÐÐÐÐÑÐÐÑÑÑ Tor ÐÐÐÑÑÐÐÑÑÑ Ñ ÑÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ Ð Ñ
-ÑÐÐÐÐÑÐÐÐÐÐ ÑÐÑÐÐ ÐÑÐÐÐ, ÐÐÑÐÑÑÐ <a href="<page
-docs/tor-doc-relay>">ÐÐÐÑÑÐÑÑ ÑÑÐÐÑÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑÐ</a>. (ÐÐÑÑÑÐÐÑÑ
-ÑÐÑÑÐÐÑÐÑÑÐÑ ÑÐÐÑÐÐ ÐÐ ÑÐÐ ÑÐÐÐÐÐ, ÐÐÐ ÐÑ, ÐÐÐÐÐÐÐÐ, ÐÑÐÐÐÑÐ, Ð ÑÑÐ ÐÐÐÐÑ
-ÐÐÐÑÐÑÐÐÑÐÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>
-ÐÐÐÑÑÐÑÑ ÑÑÐÐÐÐÑ ÐÐÑÐÐ ÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ</a>.) ÐÑÐÐ ÐÑÐÐÐÑÑÐÐÐÐÐÐÐ
-ÑÐÑÑÐÐÑÐÑÑÐÑÐ ÐÐ ÐÐÑ ÐÐÑ, ÐÑ ÐÐÐÐÑÐ <a href="<page volunteer>">ÐÐÐÐÑÑ ÐÐÐ ÐÐ
-ÐÐÐÐÐÑ ÐÑÑÐÐÑ ÐÑÐÐÐÑÐÑ ÐÑÐÐÐÑÐ</a>, Ð ÐÐÐ ÐÑÐÐÑ ÑÑÐÐÑÑÐÐ ÐÐÑ
-ÑÑÐÐÐÑÑÐÐÑÑÐÐÐÐÐÐÑ ÑÐÑÐ Tor, ÐÐÐÑÑÐÐÐÑ ÐÑ ÑÐÐÑÐÑÑÐ Ð ÑÐÑÐÑÐÐÐÑ ÐÐÐÑÐÐÑÐÐÐÑ
-ÐÐÑÐÑÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ.</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor ÑÐÐÑÐÑÑÑ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÐÐÐÐ 501(c)(3) Ð ÐÐÐ ÐÐÐÐÐÐÐÑÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐÐÐ,
 ÑÑÐÐ ÐÐÑÑÐÐÐ ÑÐÐÑÐÑÑÑ ÐÑÐÐÐÑÑÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐÑÑÐ ÐÐÑÐÑÑ ÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑ

Modified: website/trunk/ru/people.wml
===================================================================
--- website/trunk/ru/people.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/ru/people.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -20,6 +20,7 @@
 <ul>
 <li><a href="<page people>#Core">ÐÑÐÐÐÐÑÐ ÑÑÐÑÑÐÐÐÐ Tor</a></li>
 <li><a href="<page people>#Board">ÐÐÐÐÑ ÐÐÑÐÐÑÐÑÐÐ</a></li>
+<li><a href="<page people>#GSoC">Summer Students</a></li>
 <li><a href="<page people>#Translators">ÐÐÑÐÐÐÐÑÐÐÐ</a></li>
 <li><a href="<page people>#Volunteers">ÐÐÐÑÐÐÐÐÑÑÑ</a></li>
 <li><a href="<page people>#Past">ÐÑÐÐ, ÐÐÐÐÐÑÐÐÐÑÐÐ ÐÐÑ ÑÐÐÐÐ</a></li>
@@ -169,6 +170,19 @@
 </dl>
 
 <div class="underline"></div>
+<a id="GSoC"></a>
+<h3><a class="anchor" href="#GSoC">Google Summer of Code 2010 students:</a></h3>
+
+<dl>
+<dt>Kevin Berry</dt><dd>blurb here</dd>
+<dt>Harry Bock</dt><dd>blurb here</dd>
+<dt>ÐÐÑÐ ÐÐÑÐ</dt><dd>Worked during Google Summer of Code 2009 on extending Torbutton. Now he's
+working on implementing hidden services for our java Tor client. Mentored by
+Bruce Leidl.</dd>
+<dt>John Schanck</dt><dd>blurb here</dd>
+</dl>
+
+<div class="underline"></div>
 <a id="Translators"></a>
 <h3><a class="anchor" href="#Translators">ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐÐÐ:</a></h3>
 
@@ -204,8 +218,6 @@
 <dt>ÐÐÐÐÑÑ ÐÐÐÐÐ</dt><dd>ÐÐÐÑÐÐÐÑÑÐÐ ÐÐÐÑÑÐÐÐÑÐ Tor <a href="http://tork.sf.net/";>TorK</a>.</dd>
 <dt>ÐÐÐÐÐÐ ÐÐÐÐ</dt><dd>ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÑÐÐÐÑÑÐÐÐÐ Privoxy, Ð ÑÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐ Tor. ÐÐ
 ÑÐÐÑÐÑÑÑ ÐÑÐÑÐÐÐÐ, ÐÐ ÐÐÑÐÑÐÐ Tor Ð Privoxy ÐÑÐÐÑÐÑÐÐ ÑÐÐÐÑÐÑÑ ÐÐÐÑÑÐ.</dd>
-<dt>ÐÐÑÐ ÐÐÑÐ</dt><dd>ÐÐ ÐÑÐÐÑ Google Summer of Code 2009 ÑÐÐÐÑÐÐ ÐÐÐ ÑÐÑÑÐÑÐÐÐÐÐ ÑÑÐÐÑÐÐ
-Torbutton. ÐÐÐÑÐÑ ÐÐÐÑÑÐ Ñ ÐÑÑÑÐÐ ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÑÐÐ Tor Ð Java.</dd>
 <dt>ÐÑÑÑ ÐÐÐÐÐ</dt><dd>ÐÐÐÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÑÐÐ Tor Ð Java.</dd>
 <dt>ÐÐÐÑÑ ÐÐÑÑÐÐÑÐÐÐ</dt><dd>ÐÑÐÑÑ, ÑÐÐÐÑÐÑÑÐÐ Ñ Chaos Computer  Club Ð ÐÐÑÐÐÐÐÐ. ÐÐÐÑÐÐÐÐÑÑÐÑ ÐÐÐÐÑÐÐÐ
 ÑÐÐÐÑÐÑÑÐÐ Tor ÐÐ ÐÐÐÑÐÑÐÐ ÑÐÐÐÑÐÐÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÑÐ.</dd>
@@ -219,11 +231,10 @@
 Tor Ñ ÐÐÐÑÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ Windows.</dd>
 <dt>rovv (ÐÑÐÐÐÐÐÐÐ - ÐÐÑ ÑÐÐÐÐÑÑ ÐÑÑÐÑÑÑÑ ÐÐÐÐÐÐÑÑÐÑÐ, ÐÐÐÐ ÐÐÑ ÐÐÑ!)</dt><dd>ÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐÐ Ð ÐÐÐÐÑ, ÐÐÑÐÑÐÐÐ ÐÑ ÐÐÐÐÐ-ÐÐÐÐ ÐÐÐÐÐ. ÐÐ, ÐÐÐÐÐÐ
 ÐÑÑÑ, ÑÐÑÐÐÑ ÐÑÑÐÐÐÑÐ ÐÐÐ Tor ÐÐÐÐÑÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐÐÐ.</dd>
-<dt>tup (ÐÑÐ ÐÐÐÐ ÐÑÐÐÐÐÐÐÐ)</dt><dd>ÐÐÑÐÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÑÐÑ ÐÐÐÑÐ ÐÐÐÐÐÐÐÐÑÑÐ, ÐÐÐÐÑÑÐÐ Tor ÐÐÐÐÐ ÐÑÐÑÑÑÐ ÐÐÑ
-ÐÑÐÐÐÑÐÐÐÐÐÐÑ Ð ÐÐÑÐÑÑÐÐ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TransparentProxy";>ÐÑÐÐÑÐÑÐÐÐÐ
-ÐÑÐÐÑÐ</a>. ÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÑ ÑÐÐÐÑÑ <a
-href="http://p56soo2ibjkx23xo.onion/";>ÐÐÐÐ TorDNSEL</a>.</dd>
+<dt>tup (ÐÑÐ ÐÐÐÐ ÐÑÐÐÐÐÐÐÐ)</dt><dd>Periodically adds new features for making Tor easier to use as a <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TransparentProxy";>transparent
+proxy</a>. Also maintains the <a
+href="http://p56soo2ibjkx23xo.onion/";>TorDNSEL code</a>.</dd>
 <dt>ÐÐÐÐ ÐÐÐÐÑÑÐÑ</dt><dd>ÐÐÐÑÐÐÐÑÑÐÐ JanusVM - ÐÑÐÐÐÐÐÐÐÐÐ ÐÐ VMWare ÑÑÐÐÑÐÐÑÐÐÑÐÐÐÐ ÐÑÐÐÑÐ Tor,
 ÐÐÑÐÑÑÐ ÑÐÑÐÑÐÐÑ ÑÑÑÐÐÐÐÐÑ Ð ÐÑÐÐÐÑÐÐÐÐÐÐÐ Tor.</dd>
 <dt>ÐÑÐÐ ÐÑÐÐÑÐÐÐ</dt><dd>ÐÐÐÐÐÐÑ, ÐÐÐÐÑÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ <a

Modified: website/trunk/se/index.wml
===================================================================
--- website/trunk/se/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/se/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -63,14 +63,14 @@
 href="<page download>#Warning">fÃrstà vad Tor gÃr och inte gÃr Ãt dig</a>.</p>
 
 <p>
-Tors sÃkerhet fÃrbÃttras om fler anvÃnder det och om fler erbjuder sig att
-<a href="<page docs/tor-doc-relay>">kÃra Tor-noder</a> pà sina datorer. (Det
-Ãr inte alls sà svÃrt som det lÃter, och kan <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>
-signifikant Ãka din egen sÃkerhet</a>.)  Om det inte Ãr din grej att kÃra en
-Tor-nod sà kan du fortfarande <a href="<page volunteer>">bidra pà mÃnga
-andra sÃtt</a>, och vi behÃver alltid monetÃra donationer fÃr att kunna
-fortsÃtta gÃra Tor-nÃtverket snabbare, lÃttare att anvÃnda och sÃkrare.</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor Ãr i USA ett registrerat 501(c)(3) U.S. non-profit (icke vinst-drivande
 organisation) vars syfte Ãr att lÃta dig skydda din Internet-trafik frÃn

Modified: website/trunk/zh-cn/bridges.wml
===================================================================
--- website/trunk/zh-cn/bridges.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/zh-cn/bridges.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -27,11 +27,16 @@
 </p>
 
 <p>
-ææïTor äåèåååååèäèåäãææçæç <a href="<page torbrowser/index>">WindowsTor
-æèååä</a>èåçäææåçåä Tor æéååçæçãåæéåééæïæäåèäçéè
-<ahref="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>FAQïåä
-Tor äçåèéé</a> ãåææèåééåæææèåèäïææåææèäèçæåèïèæççéèãèçåææåäç<a href="<page
-download>#Dev">ææç 0.2.1.x æ 0.2.2.x </a>ç Tor èäã
+Note that it's also possible that Tor is non-functional for other
+reasons. The latest version of <a href="<page torbrowser/index>">The Tor
+Browser Bundle</a> on Windows tries to give you better hints about why Tor
+is having problems connecting. You should also read <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>the
+FAQ about problems with running Tor properly</a> when you have issues.  If
+you feel that the issue is clearly blocking, or you'd simply like to try
+because you're unsure or feeling adventurous, please read on. Ensure that
+you're using the <a href="<page download>#Dev">latest 0.2.1.x or 0.2.2.x
+bundle for your platform</a>.
 </p>
 
 <p>
@@ -120,9 +125,9 @@
 åæææææäååïäæææèè<a href="<page docs/tor-doc-relay>">æéç
 Toräç</a>ïæåäèèääçæäçãæåäçäääääçæåéçï
 <ul>
-<li> æå
-<ahref="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>çèæç
-torrc æä</a> åéèäæääåèï<br />
+<li> manually <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>edit
+your torrc file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -134,9 +139,10 @@
 </ul>
 </p>
 
-<p>åææåååæçåâCould not bind to 0.0.0.0:443: Permission deniedâèæçéèïæéèæéää
-1023 ääççåää ORPortïäå
-8080ïïæèïéç<ahref="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>åæççåèå</a>ã
+<p>If you get "Could not bind to 0.0.0.0:443: Permission denied" errors on
+startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>some
+complex port forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/zh-cn/contact.wml
===================================================================
--- website/trunk/zh-cn/contact.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/zh-cn/contact.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -32,10 +32,10 @@
 <li><tt>tor-assistants</tt>æäéççååãåæäæéääèæççééïèææäåæçåäåçåçéçã</li>
 <li><tt>tor-ops</tt> åäèçååæçåççæéçäãåææèèäå Tor
 äçåäåæçäçææçéæèåäçäéåäééïæåääçèäååèæäååèçã</li>
-<li><tt>tor-webmaster</tt>
-åääæççäçééïææççäæéèçèåæèèæïæåæççæåæçéåååæèæèãåèäåïæåäåå<a
-href="https://wiki.torproject.org/noreply/TheOnionRouter";>Tor
-ççåçç</a>ääæåååæçæèæäèçã</li>
+<li><tt>tor-webmaster</tt> can fix typos on the website, change wrong statements
+or directions on the website, and add new sections and paragraphs that you
+send us. You might want to make a draft of your new sections on <a
+href="https://trac.torproject.org/projects/tor/wiki";>the Tor wiki</a> first.</li>
 <li><tt>tor-volunteer</tt> åæçéåäæææä <a href="<page volunteer>">åæèéé</a>
 äååååååæçææãèäãæèãåäææåççåççéççäæïæèæååæåçèåäçééäååääç Tor
 çææïãåæåååæääæäåïæææåèåéäéçæä ââ ååååæèååç Internet

Modified: website/trunk/zh-cn/download.wml
===================================================================
--- website/trunk/zh-cn/download.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/zh-cn/download.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -224,10 +224,14 @@
 </li>
 
 <li>
-Tor ååéäçææïåååäå Tor ççäå Tor ççäçææææïäæ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>åäèåå
-Tor ççäéäççåäéçææ</a>ãåæäæåäèææäæïäåèååæåääæåçäèçääæèåæåââäç HTTPS
-æåäçåççååäèèææã
+Tor anonymizes the origin of your traffic, and it encrypts everything
+between you and the Tor network and everything inside the Tor network, but
+<a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>it
+can't encrypt your traffic between the Tor network and its final
+destination.</a> If you are communicating sensitive information, you should
+use as much care as you would on the normal scary Internet &mdash; use HTTPS
+or other end-to-end encryption and authentication.
 </li>
 
 <li>

Modified: website/trunk/zh-cn/index.wml
===================================================================
--- website/trunk/zh-cn/index.wml	2010-05-25 17:58:14 UTC (rev 22387)
+++ website/trunk/zh-cn/index.wml	2010-05-25 18:10:19 UTC (rev 22388)
@@ -53,11 +53,14 @@
 èääåääãäèääåää</a>ã</p>
 
 <p>
-Tor çååæéççæççæååæåçåæè <a href="<page docs/tor-doc-relay>">èèäç</a>
-èååãïèçäçåææäæèäçéäåéïèäèæè<a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity";>æéäèèçååæ</a>ãïåæäåèèäçææåèï<a
-href="<page volunteer>">èéççåäèåæéåæéèåå</a>ïæääéèèéïåäæåçååæçåæè Tor
-ççæåææääçã</p>
+Tor's security improves as its user base grows and as more people volunteer
+to <a href="<page docs/tor-doc-relay>">run relays</a>. (It isn't nearly as
+hard to set up as you might think, and can significantly <a
+href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>
+enhance your own security</a>.)  If running a relay isn't for you, we need
+<a href="<page volunteer>">help with many other aspects of the project</a>,
+and we need funds to continue making the Tor network faster and easier to
+use while maintaining good security.</p>
 
 <p>Tor æääååç 501(c)(3) U.S. éèåæççïåäåææäææåææåççæéåæãè <a href="<page
 donate>">åçæå</a>