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

[or-cvs] r23025: {website} updated files for the website (in website/trunk: bms de docs/el docs/fr docs/pl docs/ru docs/uk es et fa fi fr it lv nl no pl press/ru ru se torbrowser/fr torbrowser/ru torbutton/fr uk zh-cn)



Author: runa
Date: 2010-08-23 17:53:08 +0000 (Mon, 23 Aug 2010)
New Revision: 23025

Added:
   website/trunk/de/download.wml
   website/trunk/de/overview.wml
   website/trunk/press/ru/2008-12-19-roadmap-press-release.wml
   website/trunk/press/ru/2009-03-12-performance-roadmap-press-release.wml
   website/trunk/press/ru/2010-03-25-tor-store-press-release.wml
Removed:
   website/trunk/fr/news.wml
   website/trunk/fr/tshirt.wml
   website/trunk/it/tshirt.wml
   website/trunk/pl/news.wml
   website/trunk/pl/tshirt.wml
   website/trunk/ru/news.wml
   website/trunk/ru/tshirt.wml
Modified:
   website/trunk/bms/faq.wml
   website/trunk/de/bridges.wml
   website/trunk/de/index.wml
   website/trunk/docs/el/rpms.wml
   website/trunk/docs/fr/debian.wml
   website/trunk/docs/fr/rpms.wml
   website/trunk/docs/pl/rpms.wml
   website/trunk/docs/ru/rpms.wml
   website/trunk/docs/uk/tor-doc-windows.wml
   website/trunk/es/bridges.wml
   website/trunk/es/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-unix.wml
   website/trunk/fr/download.wml
   website/trunk/fr/faq-abuse.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/sponsors.wml
   website/trunk/fr/tormedia.wml
   website/trunk/fr/trademark-faq.wml
   website/trunk/fr/translation-overview.wml
   website/trunk/fr/volunteer.wml
   website/trunk/it/bridges.wml
   website/trunk/it/contact.wml
   website/trunk/it/hidden-services.wml
   website/trunk/it/index.wml
   website/trunk/lv/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/bridges.wml
   website/trunk/pl/contact.wml
   website/trunk/pl/documentation.wml
   website/trunk/pl/download-unix.wml
   website/trunk/pl/download.wml
   website/trunk/pl/faq-abuse.wml
   website/trunk/pl/faq.wml
   website/trunk/pl/hidden-services.wml
   website/trunk/pl/index.wml
   website/trunk/pl/people.wml
   website/trunk/pl/tormedia.wml
   website/trunk/pl/translation-overview.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-unix.wml
   website/trunk/ru/download.wml
   website/trunk/ru/faq-abuse.wml
   website/trunk/ru/faq.wml
   website/trunk/ru/hidden-services.wml
   website/trunk/ru/index.wml
   website/trunk/ru/people.wml
   website/trunk/ru/sponsors.wml
   website/trunk/se/index.wml
   website/trunk/torbrowser/fr/index.wml
   website/trunk/torbrowser/ru/index.wml
   website/trunk/torbrowser/ru/split.wml
   website/trunk/torbutton/fr/faq.wml
   website/trunk/torbutton/fr/index.wml
   website/trunk/uk/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:
updated files for the website

Modified: website/trunk/bms/faq.wml
===================================================================
--- website/trunk/bms/faq.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/bms/faq.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -92,8 +92,7 @@
 </ul>
 
 <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>
+href="<wiki>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>
@@ -219,12 +218,10 @@
 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!
+for <a href="<wiki>TorifyHOWTO">Torifying specific applications</a>. There's
+also a <a href="<wiki>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>
@@ -431,8 +428,8 @@
 
 <p>
 For the much more in-depth answer, see <a
-href="https://blog.torproject.org/blog/why-tor-is-slow";>Roger's blog post on
-the topic</a>, which includes both a detailed PDF and a video to go with it.
+href="<blog>why-tor-is-slow">Roger's blog post on the topic</a>, which
+includes both a detailed PDF and a video to go with it.
 </p>
 
 <p>
@@ -466,9 +463,8 @@
 
 <li>
 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
+performance. <a href="<wiki>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
@@ -845,9 +841,9 @@
 already running Tor. Vidalia generates a random password, but it is
 different than the saved password in the Tor service.  <br /> You need to
 reconfigure Tor to not be a service. See the FAQ entry on <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#HowdoIrunmyTorrelayasanNTservice";>running
-Tor as a Windows NT service</a> for more information on how to remove the
-Tor service.
+href="<wiki>TorFAQ#HowdoIrunmyTorrelayasanNTservice">running Tor as a
+Windows NT service</a> for more information on how to remove the Tor
+service.
 </li>
 </ol>
 
@@ -894,8 +890,7 @@
 them.  You can make the option mandatory by setting <tt>StrictExitNodes
 1</tt> or <tt>StrictEntryNodes 1</tt> &mdash; but if you do, your Tor
 connections will stop working if all of the nodes you have specified become
-unreachable.  See the <a
-href="https://www.torproject.org/documentation.html.en#NeatLinks";>Tor status
+unreachable.  See the <a href="<page documentation>#NeatLinks">Tor status
 pages</a> for some nodes you might pick.
 </p>
 <p>
@@ -921,12 +916,10 @@
 </p>
 
 <ul>
-<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>Tor has built-in support for <a href="<wiki>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="<wiki>TorFAQ#Hibernation">hibernation feature</a>.
 </li>
 <li>Tor ááááááááááááááááááááááááááááááá á áááááááááááááááá ááááááá ááááááááá
 áááááááááááááááááááááááááá áááááááá ááááááááá ááááááááááááááá
@@ -949,8 +942,8 @@
 <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.
+href="<wiki>TorFAQ#ServerForFirewalledClients">this FAQ entry</a> offers
+some examples on how to do this.
 </li>
 <li>ááááááááááááááááááááá áá áááááááááá áááááááááááááááááá áááááááááááá
 áááááááááááááááá ááááááááááááááááá áááááááááááááááááá ááááááááááá
@@ -979,22 +972,21 @@
 own situation. Read the FAQ entry on <a href="<page
 faq-abuse>#TypicalAbuses">issues you might encounter</a> if you use the
 default exit policy, and then read Mike Perry's <a
-href="https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment";>tips
-for running an exit node with minimal harassment</a>.
+href="<blog>tips-running-exit-node-minimal-harassment">tips for running an
+exit node with minimal harassment</a>.
 </p>
 
 <p>
 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.
+browsing), but <a href="<wiki>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="<wiki>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>
@@ -1069,9 +1061,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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayOS";>better
-operating system</a>.</li>
+switching to a <a href="<wiki>TorFAQ#RelayOS">better operating system</a>.</li>
 
 <li>If you still can't handle the memory load, consider reducing the amount of
 bandwidth your relay advertises. Advertising less bandwidth means you will
@@ -1180,9 +1170,8 @@
 
 <p>
 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
+to handle all our users, and <a href="<wiki>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
@@ -1220,8 +1209,7 @@
 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
+DSL)". It might be that <a href="<wiki>TorFAQ#TransportIPnotTCP">switching
 to UDP transport</a> is the simplest answer here &mdash; which alas is not a
 very simple answer at all.
 </p>
@@ -1256,11 +1244,10 @@
 </p>
 
 <p>
-ááááááá áááááááááááá áááááááááá áááááááááááááááá ááááááááááááááááááááááááá
-ááááááááá ááááá áááááááááááááááááááááá ááááááááááááááááá ááááááááááá
-ááááááááááááááááá ááááááááááá ááááááááááááá <a
-href="https://blog.torproject.org/blog/two-incentive-designs-tor";>Tor
-ááááááááááááááá ááááááááááááááááááá</a>áááááááááá
+Fifth, we might need some sort of incentive scheme to encourage people to
+relay traffic for others, and/or to become exit nodes. Here are our <a
+href="<blog>two-incentive-designs-tor">current thoughts on Tor
+incentives</a>.
 </p>
 
 <p>
@@ -1283,8 +1270,7 @@
 
 <p>
 A collection of templates for successfully responding to ISPs is <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorAbuseTemplates";>collected
-here</a>.
+href="<wiki>TorAbuseTemplates">collected here</a>.
 </p>
 
 <hr />

Modified: website/trunk/de/bridges.wml
===================================================================
--- website/trunk/de/bridges.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/de/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>FAQ
-Ãber Probleme mit Tor</a> lesen, falls UnregelmÃÃigkeiten 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="<wiki>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,10 +154,9 @@
 Sie einen BrÃcken-Server betreiben. Sie kÃnnen diesen auf folgende Arten
 konfigurieren:
 <ul>
-<li> <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>Ãndern
-Sie von Hand die torrc Datei</a> indem Sie lediglich diese vier Zeilen
-einfÃgen:<br />
+<li> manually <a
+href="<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit your torrc
+file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -171,11 +169,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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>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="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Added: website/trunk/de/download.wml
===================================================================
--- website/trunk/de/download.wml	                        (rev 0)
+++ website/trunk/de/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -0,0 +1,433 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision: 22995 $
+# Translation-Priority: 1-high
+#include "head.wmi" TITLE="Tor: Download" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
+<div class="main-column">
+
+<h2>VerfÃgbare Tor-Pakete</h2>
+
+<div class="warning">
+
+Warnung: MÃchten Sie, dass Tor wirklich funktioniert? Dann mÃssen Sie mehr
+tun, als die Software zu installieren. Sie mÃssen ein paar Ihrer
+Verhaltensweisen Ãndern und Ihre Software ÃberprÃfen! Tor an sich ist
+<em>nicht</em> alles, was Sie brauchen um anonym zu sein. Bitte nehmen Sie
+sich die Zeit und lesen Sie unsere <a href="#Warning">Warnung</a>, um sich
+mit den mÃglichen Gefahren und EinschrÃnkungen von Tor auseinanderzusetzen.
+</div>
+
+<div class="underline"></div>
+
+<table cellpadding="6" cellspacing="1" border="0" width="100%">
+<thead>
+<tr bgcolor="#009933" style="color: white; ">
+<th>Betriebssystem</th>
+<th>Stabile Version herunterladen</th>
+<th>Testversion herunterladen</th>
+<th>Installation und Konfiguration</th>
+</tr>
+</thead>
+
+<tr>
+  <td>
+    <img src="images/distros/windows.png" alt="Logo von Windows" /> Windows<br
+/> <small><em>Windows&nbsp;7, Vista, XP, 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>)
+  </td>
+  <td>
+    <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>">Windows</a>
+  </td>
+</tr>
+
+<tr bgcolor="#e5e5e5">
+  <td>
+    <img src="images/distros/windows.png" alt="Logo von Windows" />
+Tor-Browser-Paket fÃr Windows <br /> (EnthÃlt Tor, Vidalia, Torbutton,
+Polipo und Firefox)
+  </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>_de.exe"><version-torbrowser-tor></a>
+(<a
+href="torbrowser/dist/tor-browser-<version-torbrowserbundle>_de.exe.asc">sig</a>)
+  </td>  
+  <td>
+  </td>
+  <td>
+    <a href="<page torbrowser/index>">Tor-Browser-Bundle fÃr Windows</a>
+  </td>
+</tr>
+
+<tr>
+  <td>
+    <img src="images/distros/windows.png" alt="Logo von Windows" />
+Tor-IM-Browser-Paket fÃr Windows <br />(EnthÃlt Tor, Vidalia, Torbutton,
+Polipo, Firefox, und Pidgin)
+  </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>_de.exe"><version-torbrowser-tor></a>
+(<a
+href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_de.exe.asc">sig</a>)
+  </td>
+  <td>
+  </td>
+  <td>
+    <a href="<page torbrowser/index>">Tor-IM-Browser-Paket fÃr Windows</a>
+  </td>
+</tr>
+
+<tr bgcolor="#e5e5e5">
+  <td>
+    <img src="images/distros/apple.png" alt="Logo von Apple" /> Mac<br />
+<small><em>nur fÃr Intel</em></small>
+  </td>
+  <td>
+    <a href="<package-osx-bundle-stable>"><version-osx-bundle-stable></a> (<a
+href="<package-osx-bundle-alpha-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha></a> (<a
+href="<package-osx-bundle-alpha-sig>">sig</a>/<a
+href="<package-osx-bundle-alpha-sha1>">sha1</a>)
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-osx>">Mac OS X</a>
+  </td>
+</tr>
+
+<tr>
+  <td>
+   <img src="images/distros/apple.png" alt="Logo von Apple" /> Mac<br />
+<small><em>Nur fÃr PowerPC</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>">Mac OS X</a>
+  </td>
+</tr>
+
+<tr bgcolor="#e5e5e5">
+  <td>
+    <img src="images/distros/generic.png" /> Linux/Unix Pakete<br />
+<small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>
+  </td>
+  <td colspan="2">
+    <a href="<page download-unix>">Linux/Unix Downloadseite</a>
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a>
+  </td>
+</tr>
+</table>
+
+<div class="underline"></div>
+<div class="nb">
+<a id="packagediff"></a>
+<h2><a class="anchor" href="#packagediff">Was ist der Unterschied zwischen
+&quot;Stable&quot; &amp; &quot;Unstable&quot;</a></h2>
+
+<p>
+&quot;Stable&quot; Pakete werden verÃffentlicht, wenn wir glauben, dass sich
+die Features und der Code fÃr mehrere Monate nicht verÃndern werden.
+</p>
+<p>
+&quot;Unstable&quot; Pakete werden verÃffentlicht, damit du uns helfen
+kannst, neue Features und Fehlerbehebungen zu testen. Auch wenn sie eine
+hÃhere Versionsnummer haben, als die &quot;Stable&quot; Pakete weiter oben,
+besteht eine viel grÃÃere Gefahr, dass diese Downloads schwerwiegende
+Sicherheits- und ZuverlÃssigkeitsprobleme haben. Bitte hilf uns und <a
+href="https://bugs.torproject.org/";>melde Fehler</a>.
+</p>
+</div>
+
+<div class="underline"></div>
+<div class="nb">
+<p>
+Tor ist <a href="http://www.fsf.org/";>Freie Software</a> unter der <a
+href="<gitblob>LICENSE">3-clause BSD Lizenz</a>. Die Pakete enthalten auch
+<a href="<page vidalia/index>">Vidalia</a> und <a
+href="http://www.pps.jussieu.fr/~jch/software/polipo/";>Polipo</a>, welche
+Hilfsprogramme unter der GNU GPL sind.
+</p>
+<p>
+Das Installieren von Tor und die Nutzung des Netzwerks sind kostenlos, <a
+href="<page donate>">steuerbegÃnstigte Spenden an das Tor-Projekt</a> zur
+Verbesserung der Nutzbarkeit von Tor werden aber gerne angenommen.
+</p>
+</div>
+
+<div class="underline"></div>
+<div class="nb">
+<p>
+Um Ãber neue Sicherheitshinweise und aktuelle Versionen informiert zu
+bleiben, solltest du die <a href="http://archives.seul.org/or/announce/";>
+or-announce Mailingliste</a> abonnieren (du musst das Abonnement per Email
+bestÃtigen). Du kannst auch den <a
+href="http://rss.gmane.org/gmane.network.onion-routing.announce";>RSS-Feed
+der Liste beobachten</a>.
+</p>
+
+<link rel="alternate" title="Tor Project OR-announce" 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="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="or-announce abonnieren"/>
+</form>
+</div>
+
+<div class="underline"></div>
+<div class="warning">
+<a id="Warning"></a>
+<h2><a class="anchor" href="#Warning">Warnung: Willst du, dass Tor wirklich
+funktioniert?</a></h2>
+
+<p>
+...dann installier' es nicht nur einfach und denk nicht weiter drÃber
+nach. Du musst einige deiner Verhaltensweisen Ãndern und deine Software
+richtig einstellen! Tor an sich ist <em>NICHT</em> alles was du brauchst um
+anonym zu bleiben.  Es gibt mehrere schwerwiegende Fallen, in die du geraten
+kannst:
+</p>
+
+<ol>
+<li>
+Tor schÃtzt nur Internet-Anwendungen, die so eingestellt sind, dass sie
+ihren Netzwerkverkehr durch Tor leiten &mdash; es anonymisiert nicht auf
+magische Art und Weise den gesamten Datenverkehr, nur weil es installiert
+ist. Wir empfehlen <a
+href="http://www.mozilla.com/en-US/firefox/all-older.html";>Firefox</a> mit
+der <a href="<page torbutton/index>">Torbutton</a> Erweiterung zu benutzen.
+</li>
+
+<li>
+Torbutton blockiert Browserplugins wie Java, Flash, ActiveX, RealPlayer,
+Quicktime, Adobes PDF Plugin und andere: Diese Programme kÃnnen dazu
+gebracht werden, deine richtige IP Adresse zu verraten. Das bedeutet zum
+Beispiel auch dass YouTube nicht funktioniert. Wenn du wirklich YouTube
+benÃtigst, kannst du <a href="<page torbutton/faq>#noflash">Torbutton so
+umstellen,</a> dass Youtube erlaubt wird; aber sei dir im Klaren darÃber,
+dass du dich damit potenziell angreifbar machst. Auch Erweiterungen wie die
+Google Toolbar suchen nach zusÃtzlichen Informationen Ãber Seiten die du
+besuchst: Dabei kÃnnten sie Tor umgehen und/oder sensible Informationen
+weitergeben. Es gibt Leute die aus diesem Grund zwei Browser benutzen (einen
+fÃr Tor und einen fÃr unsicheres Browsing).
+</li>
+
+<li>
+Vorsicht bei Cookies: Wenn du jemals ohne Tor auf eine Seite gehst und diese
+dir einen Cookie einrichtet, kÃnnte dich dieser Cookie identifizieren, wenn
+du wieder Tor benutzt. Torbutton versucht deine Cookies dagegen
+abzusichern. <a
+href="https://addons.mozilla.org/firefox/82/";>CookieCuller</a> kann dir
+helfen, Cookies zu sichern die du nicht verlieren willst.
+</li>
+
+<li>
+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="<wiki>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>
+Zwar schÃtzt dich Tor davor, dass lokale Angreifer deine Daten beeinflussen
+oder mithÃren, aber es bringt auch neue Risiken: falsche oder bÃswillig
+konfigurierte Exit-Knoten kÃnnen dich auf falsche Seiten leiten oder dir
+sogar verschleierte Applets schicken, die so aussehen als kÃmen sie von
+einer vertrauenswÃrdigen Seite. Du solltest sehr vorsichtig sein, wenn du
+Programme oder Dokumente Ãber Tor runtergeladen hast und deren IntegritÃt
+nicht ÃberprÃfen kannst.
+</li>
+</ol>
+
+<br />
+<p>
+Sei schlau und lerne mehr! Verstehe, was Tor kann und was nicht.  Die Liste
+der Risiken ist nicht vollstÃndig und wir brauchen deine Hilfe <a
+href="<page volunteer>#Documentation">um alle Probleme zu identifizieren und
+zu dokumentieren</a>.
+</p>
+</div>
+
+<div class="underline"></div>
+<div class="nb">
+<p>
+Schau in unseren <a href="<page verifying-signatures>">FAQ Eintrag wie man
+Signaturen ÃberprÃft</a> um sicherzugehen kannst, dass du auch die Datei
+heruntergeladen hast, die wir zum Download bereitstellen.
+</p>
+
+<p>
+Falls Sie eine Ãltere Version des Quellcodes von Tor untersuchen mÃchten
+oder andere BinÃrdateien, besuchen Sie das <a
+href="http://archive.torproject.org/tor-package-archive/";>Archiv</a>.
+</p>
+
+<p>
+In den <a href="<page documentation>#Developers">Dokumenten fÃr Entwickler
+(Engl.)</a> findest du eine Anleitung, wie man Tor mittels Git herunterladen
+kann, um den neuesten Quellcode zu bekommen. Du kannst auch den <a
+href="dist/">Privoxy Quellcode</a> oder den <a
+href="dist/vidalia-bundles/?C=M;O=D">Vidalia Quellcode</a> runterladen.
+</p>
+</div>
+
+<div class="underline"></div>
+<div class="nb">
+<p>
+Wenn du Probleme hast, Tor von dieser Seite zu bekommen, gibt es eine <a
+href="<page mirrors>">Liste von Spiegel-Seiten der Tor Webseite</a>.
+</p>
+
+<a id="ChangeLog"></a> <a id="Stable"></a> <a id="Testing"></a>
+<p>
+Wenn du wissen willst, was sich in den Stable-Versionen geÃndert hat, schau
+in die <a href="<gitblobstable>ReleaseNotes">Release Notes</a>. FÃr eine
+Liste der Ãnderungen in der Stable und in der Unstable Version schau in das
+<a href="<gitblob>ChangeLog">ChangeLog</a>.
+</p>
+</div>
+<div class="underline"></div>
+
+<a id="Dev"></a>
+<h2><a class="anchor" href="#Dev">Experten Pakete &amp; Quellcode</a></h2>
+
+<p>
+Die Pakete fÃr Experten enthalten nur Tor. Das bedeutet, dass du Tor selbst
+einrichten musst.
+</p>
+
+<table cellpadding="6" cellspacing="1" border="0" width="100%">
+<thead>
+<tr bgcolor="#009933" style="color: white; ">
+<th>Betriebssystem</th>
+<th>Stabile Version herunterladen</th>
+<th>Testversion herunterladen</th>
+<th>Installation und Konfiguration</th>
+</tr>
+</thead>
+
+<tr>
+  <td>
+    <img src="images/ico-win.png" /> Windows (EnthÃlt nur Tor)<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="<package-win32-alpha>"><version-win32-alpha></a> (<a
+href="<package-win32-alpha-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-windows>">Windows</a>
+  </td>
+</tr>
+
+<tr bgcolor="#e5e5e5">
+  <td>
+    <img src="images/ico-osx-uni.png" /> Mac (EnthÃlt nur Tor)<br />
+<small><em>Nur Intel, kein Support fÃr Snow Leopard (10.6)</em></small>
+  </td>
+  <td>
+    <a href="<package-osx-stable>"><version-osx-stable></a> (<a
+href="<package-osx-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <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-osx>">Mac OS X</a>
+  </td>
+</tr>
+
+<tr>
+  <td>
+    Mac (EnthÃlt nur Tor)<br /> <small><em>Nur PowerPC</em></small>
+  </td>
+  <td>
+    <a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a
+href="<package-oldosx-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <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>">Mac OS X</a>
+  </td>
+</tr>
+
+<tr bgcolor="#e5e5e5">
+  <td>
+    <img src="images/ico-tux.png" /> Linux/Unix Pakete (Enthalten nur Tor)<br />
+<small><em>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</em></small>
+  </td>
+  <td colspan="2">
+    <a href="<page download-unix>">Linux/Unix Downloadseite</a>
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a>
+  </td>
+</tr>
+
+<tr>
+  <td>
+    Quellcode Tarballs<br /> <kbd>./configure &amp;&amp; make &amp;&amp;
+src/or/tor</kbd>
+  </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>
+
+</div>
+
+
+
+#include <foot.wmi>

Modified: website/trunk/de/index.wml
===================================================================
--- website/trunk/de/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/de/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -64,16 +64,13 @@
 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://trac.torproject.org/projects/tor/wiki/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, ohne die Sicherheit einzuschrÃnken.</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="<wiki>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
@@ -85,11 +82,10 @@
 <div class="underline"></div>
 
 <ul>
-<li>02. Mai 2010: Tor 0.2.1.26 wurde als neue stabile Version
-verÃffentlicht. Sie behebt weitere OpenSSL KompatibilitÃtsprobleme und
-erlaubt es Relays sich gegen zu viele Verbindungen zu wehren. Lies die <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>VerÃffentlichung</a>
-fÃr weitere Informationen.</li>
+<li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
+compatibility issues and lets relays defend themselves from connection
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
+announcement</a> for the list of changes.</li>
 <li>29. MÃrz 2010: Tor und Printfection kÃndigen den Tor Store an. Lesen Sie die
 <a href="<page
 press/2010-03-25-tor-store-press-release>">Pressemitteilung</a> fÃr weitere

Added: website/trunk/de/overview.wml
===================================================================
--- website/trunk/de/overview.wml	                        (rev 0)
+++ website/trunk/de/overview.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision: 22308 $
+# Translation-Priority: 2-medium
+#include "head.wmi" TITLE="Tor: Overview" CHARSET="UTF-8"
+<div class="main-column">
+
+<a name="overview"></a>
+<h2><a class="anchor" href="#overview">Tor: Ãbersicht</a></h2>
+
+<!-- BEGIN SIDEBAR -->
+<div class="sidebar-left">
+<h3>Inhalt</h3>
+<ul>
+<li><a href="<page overview>#overview">Ãbersicht</a></li>
+<li><a href="<page overview>#whyweneedtor">Warum wir Tor brauchen</a></li>
+<li><a href="<page overview>#thesolution">Die LÃsung</a></li>
+<li><a href="<page overview>#hiddenservices">Versteckte Dienste</a></li>
+<li><a href="<page overview>#stayinganonymous">Anonym bleiben</a></li>
+<li><a href="<page overview>#thefutureoftor">Die Zukunft von Tor</a></li>
+</ul>
+</div>
+
+
+<!-- END SIDEBAR -->
+<hr />
+
+<p>
+Tor ist ein Netzwerk virtueller Tunnel, das es Einzelpersonen und Gruppen
+ermÃglicht, den Schutz ihrer PrivatsphÃre und ihre Sicherheit im Internet zu
+verbessern.  Es ermÃglicht auÃerdem Softwareentwicklern, neue
+Kommunikationswerkzeuge zu entwickeln, bei denen die PrivatsphÃre bereits
+eingebaut ist.  Tor stellt die Grundlage fÃr eine Reihe von Anwendungen zur
+VerfÃgung, die es Organisationen und Individuen erlaubt, Informationen Ãber
+Ãffentliche Netze auszutauschen, ohne ihre PrivatsphÃre zu gefÃhrden.
+</p>
+
+<p>
+Individuen kÃnnen mittels Tor andere Webseiten daran hindern, ihren Weg beim
+Surfen aufzuzeichnen. Weiterhin kÃnnen sie es dazu verwenden, um eine
+Verbindung zu Nachrichtenseiten oder Instant-Messaging-Services
+herzustellen, die von ihrem <acronym title="Internet Service
+Provider">ISP</acronym> gesperrt wurden. Die <a href="<page
+docs/tor-hidden-service>">versteckten Services</a> von Tor bieten die
+MÃglichkeit, Webseiten und andere Dienste zu verÃffentlichen, ohne den
+Standort der Seite preiszugeben. Menschen nutzen Tor auch, um sensible
+Informationen auszutauschen: ChatrÃume und Webforen fÃr Vergewaltigungsopfer
+und Ãberlebende von Misshandlungen oder auch Menschen mit Erkrankungen.
+</p>
+
+<p>
+Journalisten nutzen Tor, um sicherer mit ihren Informanten und Dissidenten
+zu kommunizieren. Nichtstaatliche Organisationen (<abbr
+title="non-governmental organisations">NGO</abbr>s) nutzen Tor, damit ihre
+Mitarbeiter die Organisations-Webseite aufrufen kÃnnen, wÃhrend sie sich im
+Ausland befinden, ohne preiszugeben, dass sie fÃr diese Organisation
+arbeiten.
+</p>
+
+<p>
+Gruppen wie Indymedia empfehlen ihren Mitgliedern Tor fÃr die Absicherung
+ihrer PrivatsphÃre und Sicherheit im Netz.  Aktivistengruppen wie die
+Electronic Frontier Foundation (EFF) empfehlen Tor als Mittel zur
+Aufrechterhaltung der bÃrgerlichen Freiheit im Netz.  Firmen nutzen Tor als
+sicheren Weg zur DurchfÃhrung von Wettbewerbsanalysen und um sensible
+BeschaffungsvorgÃnge gegen Lauscher zu schÃtzen.  Tor wird auch genutzt, um
+traditionelle <abbr title="Virtuelles Privates Netzwerk">VPN</abbr>s zu
+ersetzen, die den genauen Umfang und den Zeitablauf der Kommunikation
+enthÃllen. An welchen Standorten gibt es Mitarbeiter, die bis in die Nacht
+hinein arbeiten? Welche Standorte haben Mitarbeiter, die JobbÃrsen besuchen?
+Welche Forschungsabteilungen kommunizieren mit den PatentanwÃlten der Firma?
+</p>
+
+<p>
+Ein Zweig der US-Marine verwendet die Software, um Informationen aus offenen
+Quellen zu gewinnen (Open Source Intelligence). Eines ihrer Teams verwendete
+Tor, als es neulich im Nahen Osten eingesetzt war. Die SicherheitsbehÃrden
+nutzen Tor, um Webseiten zu besuchen und zu Ãberwachen, ohne
+Regierungs-IP-Adressen in den Web-Logs zu hinterlassen und fÃr die
+Sicherheit bei verdeckten Ermittlungen.
+</p>
+
+<p>
+Die Vielfalt der Tor-Benutzer ist ein Teil von dem was <a
+href="http://freehaven.net/doc/fc03/econymics.pdf";>Tor so sicher
+macht</a>. Tor versteckt dich in der <a href="<page torusers>">Menge der
+anderen Benutzer des Netzwerks</a>. Damit ist deine AnonymitÃt um so stÃrker
+geschÃtzt, je grÃÃer und differenzierter die Benutzerbasis von Tor ist.
+</p>
+
+<a name="whyweneedtor"></a>
+<h3><a class="anchor" href="#whyweneedtor">Warum wir Tor brauchen</a></h3>
+
+<p>
+Die Nutzung von Tor schÃtzt dich gegen eine Ãbliche Form der
+InternetÃberwachung, die als Verkehrsanalyse bekannt ist. Diese Analyse des
+Netzwerkverkehrs kann dazu verwendet werden, Informationen abzuleiten, wer
+mit wem Ãber ein Ãffentliches Netzwerk kommuniziert. Wenn jemand Quelle und
+Ziel deines Internetverkehrs kennt, kann er dein Verhalten und deine
+Vorlieben nachvollziehen. Das kann sich auf deinen Geldbeutel auswirken,
+indem z.B. eine E-Commerce-Seite ihre Preisgestaltung von deinem
+Herkunftsland oder deiner Firma abhÃngig macht. Es kann sogar deinen
+Arbeitsplatz und kÃrperliche Unversehrtheit bedrohen, wenn Ãffentlich wird,
+wer du bist und wo du dich aufhÃltst. Wenn du dich beispielsweise im Ausland
+auf Dienstreise befindest und dich mit dem Computer deines Arbeitgebers
+verbindest, kannst du ungewollt deine NationalitÃt und Arbeitgeber jedem
+gegenÃber offenbaren, der das Netzwerk beobachtet, auch wenn die Verbindung
+verschlÃsselt ist.
+</p>
+
+<p>
+Wie funktioniert nun die Verkehrsanalyse? Die Datenpakete im Internet haben
+zwei Teile: die Nutzlast, die die eigentlichen Daten trÃgt und der Kopf, wo
+die verschiedenen Informationen zum Routing zu finden sind. Auch wenn du die
+Nutzlast verschlÃsselst, enthÃllt die Verkehrsanalyse, was du tust und
+mÃglicherweise auch, was du sagst. Dies geschieht deshalb, da sie sich auf
+die Kopfdaten fokussiert und damit Quelle, Ziel, GrÃÃe, Zeitablauf
+etc. enthÃllt.
+</p>
+
+<p>
+Ein grundlegendes Problem beim Schutz der PrivatsphÃre ist, dass der
+EmpfÃnger an den Kopfdaten sehen kann, dass du die Daten versandt hast. So
+kÃnnen auch autorisierte Vermittler, wie ISPs, und manchmal auch
+unautorisierte verfahren. Eine sehr einfache Form der Verkehrsanalyse kÃnnte
+sein, irgendwo zwischen dem Sender und EmpfÃnger zu sitzen und die Kopfdaten
+zu verfolgen.
+</p>
+
+<p>
+NatÃrlich existieren auch mÃchtigere Formen der Verkehrsanalyse.  Einige
+Angreifer spionieren in verschiedenen Teilen des Internets und nutzen
+fortgeschrittene statistische Methoden, um die Kommunikationsmuster von
+verschiedenen Organisationen und Einzelpersonen zu
+verfolgen. VerschlÃsselung hilft nicht gegen diese Angreifer, da diese nur
+den Inhalt der Kommunikation verbirgt, aber nicht die Kopfdaten.
+</p>
+
+<a name="thesolution"></a>
+<h3><a class="anchor" href="#thesolution">Die LÃsung: ein verteiltes, anonymes
+Netzwerk</a></h3>
+
+<p>
+Tor hilft dabei, das Risiko sowohl der einfachen als auch der ausgefeilten
+Verkehrsanalyse zu verringern, indem es deine Transaktionen Ãber
+verschiedene Stellen des Internet verteilt. Damit gibt es keinen einzelnen
+Punkt, an dem du mit der Kommunikation in Verbindung gebracht werden
+kannst.  Die Idee lÃsst sich damit vergleichen, eine verwinkelte, schwer zu
+verfolgende Route zu benutzen, um einen Verfolger abzuschÃtteln &mdash; und
+auÃerdem regelmÃÃig FuÃspuren zu verwischen.  Anstatt einen direkten Weg vom
+Ausgangspunkt zum Ziel zu nehmen, verwenden Datenpakete im Tor-Netzwerk
+einen zufÃlligen Pfad Ãber mehrere Server. Diese verwischen ihre Spuren, so
+dass an keiner Stelle ein Beobachter sagen kann, woher ein Datenpaket kam
+und wohin es unterwegs ist.
+</p>
+
+<p><img alt="Tor-Verbindung Schritt eins" src="$(IMGROOT)/htw1_de.png" /></p>
+
+<p>
+Um einen privaten Netzwerkpfad mit Tor zu erzeugen, baut die Software des
+Benutzers, der Client, schrittweise eine Menge an verschlÃsselten
+Verbindungen zu den Servern im Netzwerk auf.  Dieser Pfad wird um jeweils
+einen Schritt erweitert, und jeder Server entlang des Wegs weià nur, von
+welchem Server er Daten bekam und zu welchem er sie weitergibt.  Kein
+einzelner Server kennt jemals den gesamten Pfad, den ein Datenpaket genommen
+hat. Der Client handelt fÃr jeden Schritt entlang des Pfads einen eigenen
+Satz von VerschlÃsselungsschlÃsseln aus und stellt damit sicher, dass kein
+Server die Verbindungen nachvollziehen kann, wÃhrend sie bei ihm
+vorbeikommen.
+</p>
+
+<p><img alt="Tor-Verbindung Schritt zwei" src="$(IMGROOT)/htw2_de.png" /></p>
+
+<p>
+Sobald ein Kanal erÃffnet ist, kÃnnen verschiedene Datenarten Ãber ihn
+ausgetauscht werden, und unterschiedliche Arten von Anwendungen kÃnnen mit
+dem Tor-Netzwerk verwendet werden. Da jeder Server nur einen Schritt kennt,
+kann weder ein Lauscher noch ein kompromittierter Server Verkehrsanalyse
+einsetzen, um die Quelle einer Kommunikation mit ihrem Ziel zu
+verbinden. Tor funktioniert nur Ãber TCP-Streams und kann mit jeder
+Anwendung verwendet werden, die SOCKS unterstÃtzt.
+</p>
+
+<p>
+Aus EffizienzgrÃnden verwendet die Tor-Software denselben Kanal fÃr alle
+Verbindungen, die innerhalb von etwa zehn Minuten aufgebaut werden.  SpÃtere
+Anforderungen erhalten einen neuen Kanal, damit niemand deine frÃheren
+Handlungen mit den neuen in Verbindung bringen kann.
+</p>
+
+<p><img alt="Tor-Verbindung Schritt drei" src="$(IMGROOT)/htw3_de.png" /></p>
+
+
+<a name="hiddenservices"></a>
+<h3><a class="anchor" href="#hiddenservices">Versteckte Dienste</a></h3>
+
+<p>
+Tor ermÃglicht es Benutzern, ihren Aufenthaltsort zu verbergen, wÃhrend sie
+verschiedene Dienste wie z.B. VerÃffentlichungen im Web oder
+Instant-Messaging anbieten.  Durch die Verwendung von Tor
+"Rendezvous-Punkten" kÃnnen andere Tor-Benutzer auf versteckte Dienste
+zugreifen, ohne dabei die NetzwerkidentitÃt des Anderen zu kennen. Die
+FunktionalitÃt dieser versteckten Dienste kÃnnte es Tor-Benutzern
+ermÃglichen, eine Webseite einzurichten, auf der Menschen ohne Angst vor
+Zensur Material verÃffentlichen. Niemand wÃre in der Lage festzustellen, wer
+die Webseite anbietet, und der Anbieter der Webseite wÃsste nicht, wer auf
+ihr was verÃffentlicht. Du kannst auf den folgenden Seiten mehr darÃber
+erfahren, wie man einen <a href="<page docs/tor-hidden-service>">versteckten
+Dienst konfiguriert</a> und wie das <a href="<page
+hidden-services>">Protokoll</a> funktioniert.
+</p>
+
+<a name="stayinganonymous"></a>
+<h3><a class="anchor" href="#stayinganonymous">Anonym bleiben</a></h3>
+
+<p>
+Tor kann nicht alle AnonymitÃtsprobleme lÃsen.  Es konzentriert sich darauf,
+den Transport von Daten zu schÃtzen.  Du musst protokollspezifische Software
+verwenden, wenn du nicht mÃchtest, dass die von dir besuchten Seiten
+Informationen Ãber deine IdentitÃt erhalten. Beispielsweise kannst du einen
+Webproxy wie Privoxy verwenden, um Cookies und die Herausgabe von
+Informationen Ãber den Browsertyp zu blockieren.
+</p>
+
+<p>
+Sei clever, wenn du deine AnonymitÃt schÃtzen mÃchtest. Gib weder deinen
+Namen noch andere Informationen Ãber dich in Web-Formularen an. Sei dir der
+Tatsache bewusst, dass Tor, wie jedes Anonymisierungsnetzwerk, das schnell
+genug fÃr das Webbrowsing ist, nicht gegen Ende-zu-Ende-Timing-Angriffe
+schÃtzt: Wenn der Angreifer den von deinem Computer ausgehenden Verkehr und
+auch den am gewÃhlten Ziel ankommenden Verkehr beobachten kann, kann er
+statistische Analysen verwenden um zu erkennen, dass beide Teil derselben
+Kommunikationsverbindung sind.
+</p>
+
+<a name="thefutureoftor"></a>
+<h3><a class="anchor" href="#thefutureoftor">Die Zukunft von Tor</a></h3>
+
+<p>
+Es ist eine stÃndige Herausforderung, ein dauerhaftes
+Anonymisierungsnetzwerk im Internet anzubieten. Wir wollen Software, die den
+BedÃrfnissen der Benutzer entspricht.  Wir wollen auch das Netzwerk auf eine
+Art in Betrieb halten, die so viele Benutzer wie mÃglich vertrÃgt.
+Sicherheit und Benutzerfreundlichkeit mÃssen im Einklang sein: WÃhrend die
+Benutzerfreundlichkeit von Tor steigt, wird es mehr Benutzer anziehen, die
+die Zahl der mÃglichen Quellen und Ziele fÃr jede Kommunikation erhÃhen und
+damit die Sicherheit fÃr jeden verbessern.  Wir machen Fortschritte, aber
+wir benÃtigen deine Hilfe.  Bitte Ãberlege, ob du einen <a href="<page
+docs/tor-doc-relay>">Server installieren</a> oder ob du <a href="<page
+volunteer>">freiwillig</a> als <a href="<page
+documentation>#Developers">Entwickler</a> einen Beitrag leisten mÃchtest.
+</p>
+
+<p>
+Andauernde Trends in Gesetzgebung, Politik und Technologie bedrohen
+AnonymitÃt wie niemals zuvor, und sie untergraben unsere MÃglichkeiten, frei
+im Netz zu schreiben und zu lesen.  Diese Trends untergraben auch die
+nationale Sicherheit und kritische Infrastruktur, indem sie die
+Kommunikation zwischen Einzelpersonen, Organisationen, Firmen und
+Regierungen fÃr das Ausspionieren angreifbarer machen. Jeder neue
+Tor-Benutzer und -Server liefert zusÃtzliche Vielfalt und erhÃht damit die
+FÃhigkeit von Tor, die Kontrolle Ãber deine Sicherheit und PrivatsphÃre
+wieder in deine HÃnde zu legen.
+</p>
+
+  </div>
+
+
+#include <foot.wmi>

Modified: website/trunk/docs/el/rpms.wml
===================================================================
--- website/trunk/docs/el/rpms.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/docs/el/rpms.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -37,13 +37,11 @@
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org
 </pre>
 
-ÎÎ ÎÎÎÎÏÎ ÎÎ ÎÎÎÎÎÏÎÎÏÎÏÎ ÏÎÏ ÏÏÎÎÎÏÎÏ ÎÎÎÏÏÎÎÏ ÏÎÏ Tor, ÏÏÎÏÎÎ ÎÎ
-ÎÎÏÎÎÎÏÎÏÏÎÏÎÏÎ ÏÎ ÎÎÎÎ DISTRIBUTION ÎÎ ÎÎÎ ÎÏÏ ÏÎ ÎÎÏÎÎÏÎÎ: centos4,
-centos5, fc10, fc11, fc12, suse</p>
+If you wish to track the stable releases of Tor, you should substitute
+DISTRIBUTION with one of the following: centos4, centos5, fc11, fc12, suse</p>
 
-<p>ÎÎ ÎÎÎÎÏÎ ÎÎ ÎÎÎÎÎÏÎÎÎÏÎ ÏÎÏ ÏÎÎÏÎÎÎÏÎÎÎÏ ÎÎÎÏÏÎÎÏ, ÎÎÏÎÎÎÏÎÏÏÎÏÏÎ ÏÎ ÎÎÎÎ
-DISTRIBUTION ÎÎ ÎÎÏÎÎÎ ÎÏÏ ÏÎ ÎÎÏÎÎÏÎÎ: centos4-experimental,
-centos5-experimental, fc10-experimental, fc11-experimental,
+<p>To track experimental releases, substitute DISTRIBUTION with one of these:
+centos4-experimental, centos5-experimental, fc11-experimental,
 fc12-experimental, suse-experimental</p>
 
 <p>

Modified: website/trunk/docs/fr/debian.wml
===================================================================
--- website/trunk/docs/fr/debian.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/docs/fr/debian.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -47,17 +47,18 @@
 </p>
 
 <p>
-You'll need to set up our package repository before you can fetch
-Tor. First, you need to figure out the name of your distribution. If you're
-using Ubuntu 10.04 it's "lucid", 9.10 is "karmic", 9.04 is "jaunty", 8.10 is
-"intrepid", and 8.04 is "hardy". If you're using Debian Etch, it's "etch",
-and Debian Lenny is "lenny". Then add this line to your
-<tt>/etc/apt/sources.list</tt> file:<br />
+Vous aurez besoin d'utiliser notre dÃpÃt de paquets avant de rÃcupÃrer
+Tor. Vous aurez d'abord besoin de connaÃtre le nom de votre distribution. Si
+vous utilisez Ubuntu 10.04, il s'agit de "lucid" alors que pour la 9.10,
+c'est "karmic", 9.04 c'est "jaunty", 8.10 c'est "intrepid" et la 8.04 c'est
+"hardy". Si vous utilisez Debian Etch, c'est "etch", et Debian Lenny c'est
+"lenny". Ajoutez ensuite cette ligne à votre fichier
+<tt>/etc/apt/sources.list</tt> :<br />
 <pre>
 deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
 </pre>
-where you put the codename of your distribution (i.e. etch, lenny, sid,
-lucid, karmic, jaunty, intrepid, hardy or whatever it is) in place of
+ou vous substituez le nom de votre distribution (etch, lenny, sid, lucid,
+karmic, jaunty, intrepid, hardy ou n'importe quoi d'autre) Ã la place de
 &lt;DISTRIBUTION&gt;.
 </p>
 
@@ -68,8 +69,8 @@
 gpg --keyserver keys.gnupg.net --recv 886DDD89
 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
 </pre>
-Now refresh your sources and install Tor by running the following commands
-(as root) at your command prompt:
+Maintenant, vous pouvez rafraÃchir vos sources et installer Tor en lanÃant
+les commandes suivantes dans votre shell (sous root):
 <pre>
 apt-get update
 apt-get install tor tor-geoipdb
@@ -104,8 +105,9 @@
 deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
 deb     http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main
 </pre>
-where you again substitute the name of your distro (etch, lenny, sid, lucid,
-karmic, jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
+ou vous substituez, une fois de plus, le nom de votre distribution (etch,
+lenny, sid, lucid, karmic, jaunty, intrepid, hardy) Ã la place de
+&lt;DISTRIBUTION&gt;.
 </p>
 
 <p>

Modified: website/trunk/docs/fr/rpms.wml
===================================================================
--- website/trunk/docs/fr/rpms.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/docs/fr/rpms.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -37,13 +37,12 @@
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org
 </pre>
 
-Si vous dÃsirez suivre les versions stables de Tor, vous devriez remplacer
-le mot DISTRIBUTION par l'un des mots suivants: centos4, centos5, fc10,
-fc11, fc12, suse</p>
+If you wish to track the stable releases of Tor, you should substitute
+DISTRIBUTION with one of the following: centos4, centos5, fc11, fc12, suse</p>
 
-<p>Pour suivre les versions expÃrimentales, remplacez le mot DISTRIBUTION avec
-l'un des mots suivants: centos4-experimental, centos5-experimental,
-fc10-experimental, fc11-experimental, fc12-experimental, suse-experimental</p>
+<p>To track experimental releases, substitute DISTRIBUTION with one of these:
+centos4-experimental, centos5-experimental, fc11-experimental,
+fc12-experimental, suse-experimental</p>
 
 <p>
 Maintenant, Tor est installà et fonctionne. Allez à <a href="<page

Modified: website/trunk/docs/pl/rpms.wml
===================================================================
--- website/trunk/docs/pl/rpms.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/docs/pl/rpms.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -36,13 +36,11 @@
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org
 </pre>
 
-JeÅli chcecie byÄ na bieÅÄco z wersjami stabilnymi Tora, powinniÅcie zmieniÄ
-DISTRIBUTION na jedno z nastÄpujÄcych: centos4, centos5, fc10, fc11, fc12,
-suse</p>
+If you wish to track the stable releases of Tor, you should substitute
+DISTRIBUTION with one of the following: centos4, centos5, fc11, fc12, suse</p>
 
-<p>JeÅli chcecie byÄ na bieÅÄco z wersjami eksperymentalnymi, zmieÅcie
-DISTRIBUTION na jedno z nastÄpujÄcych: centos4-experimental,
-centos5-experimental, fc10-experimental, fc11-experimental,
+<p>To track experimental releases, substitute DISTRIBUTION with one of these:
+centos4-experimental, centos5-experimental, fc11-experimental,
 fc12-experimental, suse-experimental</p>
 
 <p>

Modified: website/trunk/docs/ru/rpms.wml
===================================================================
--- website/trunk/docs/ru/rpms.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/docs/ru/rpms.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -37,14 +37,12 @@
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org
 </pre>
 
-ÐÑÐÐ ÐÑ ÑÐÑÐÑÐ ÐÐÐÐÐÑÐÐÐÐÑÑ Tor Ð ÐÐÑÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐ, ÐÐÐ ÐÐÑÑÐÐÑÐÑÑÑ
-ÐÐÐÐÐÐÑÑ ÑÑÑÐÐÑ DISTRIBUTION ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÑÑÑÐÑ: centos4, centos5, fc10,
-fc11, fc12, suse</p>
+If you wish to track the stable releases of Tor, you should substitute
+DISTRIBUTION with one of the following: centos4, centos5, fc11, fc12, suse</p>
 
-<p>ÐÑÐÐ ÐÐ ÐÑ ÑÐÑÐÑÐ, ÑÑÐÐÑ Ñ ÐÐÑ ÐÑÐÐ ÑÑÑÐÐÐÐÐÐÐÐ ÑÐÐÐÑ ÐÐÑÐÐÐÐÑÑ (ÐÐÑÑÐÐÑ)
-ÐÐÑÑÐÑ Tor, ÐÐÐÐÐÐÑÐ ÑÑÑÐÐÑ DISTRIBUTION ÐÐÐÐÐ ÐÐ ÑÑÐÑ:
-centos4-experimental, centos5-experimental, fc10-experimental,
-fc11-experimental, fc12-experimental, suse-experimental</p>
+<p>To track experimental releases, substitute DISTRIBUTION with one of these:
+centos4-experimental, centos5-experimental, fc11-experimental,
+fc12-experimental, suse-experimental</p>
 
 <p>
 ÐÐÐÐÑÑ Tor ÑÑÑÐÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÐ. ÐÐÐÐÐÐÐÑÑÐÑÑ ÑÐ <a href="<page

Modified: website/trunk/docs/uk/tor-doc-windows.wml
===================================================================
--- website/trunk/docs/uk/tor-doc-windows.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/docs/uk/tor-doc-windows.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -95,7 +95,8 @@
 
 <p>
 ÐÐÑÐ ÐÐ ÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÑÑÐÐÑÐÐÑÐ Firefox ÐÐ ÐÐ ÑÐÐÑ ÐÐÐÐ'ÑÑÐÑÑ, ÐÑÐÐ
-ÐÑÑÐÐÐÐÐÐÐÐ Tor, ÐÐÐÐÐÐÐÑÐÑÑ Ð <a href="https://wiki.torproject.org/noreply/TheOnionRouter";>https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ÐÑÑÐÐÐÐÐÐÐÐ Tor, ÐÐÐÐÐÐÐÑÐÑÑ Ð <a href = "https: / / wiki.torproject.org /
+noreply / TheOnionRouter
 </p>
 
 <p>ÐÐÑ "ÐÐÑÑÑÑÐÐÑÑÑ" ÑÐÑÐÑ ÐÑÐÐÑÐÐ, ÑÐÑ ÐÑÐÑÑÐÐÑÑÑÑ HTTP ÐÑÐÐÑÑ, ÐÑÐÑÑÐ ÐÐÐÐÑÑÑ

Modified: website/trunk/es/bridges.wml
===================================================================
--- website/trunk/es/bridges.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/es/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -37,17 +37,16 @@
 </p>
 
 <p>
-FÃjese que tambiÃn es posible que Tor no sea funcional por otros motivos. La
-Ãltima versiÃn de <a href="<page torbrowser/index>">El Paquete del Navegador
-Tor</a> sobre Windows trata de darle los mejores indicios acerca de por quÃ
-Tor està teniendo problemas para conectarse. Debe leer tambiÃn <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>las
-Preguntas MÃs Frecuentes acerca de problemas con la ejecuciÃn correcta del
-Tor</a> cuando tenga dificultades en esto. Si piensa que la dificultad
-consiste evidentemente en el bloqueo, o simplemente le gustarÃa probar
-porque no està seguro de tener suerte, lÃalo. AsegÃrese de estar usando el
-<a href="<page download>#Dev">Ãltimo paquete 0.2.1.x o el 0.2.2.x para su
-plataforma</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="<wiki>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>
@@ -156,9 +155,9 @@
 docs/tor-doc-relay>">repetidor normal de Tor</a>, debe ejecutar un repetidor
 de puente. Puede configurarlo de cualquier manera:
 <ul>
-<li> <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>editar
-su archivo torrc</a> manualmente con sÃlo estas cuatro lÃneas:<br />
+<li> manually <a
+href="<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit your torrc
+file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -171,11 +170,10 @@
 </ul>
 </p>
 
-<p>Si recibe "Could not bind to 0.0.0.0:443: Permission denied" "No se pudo
-conectar con 0.0.0.0:443: Permiso denegado, necesitarà tomar un ORPort mÃs
-alto (por ejemplo 8080) o ejecutar <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>algÃn
-envÃo mÃs complejo de puerto</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="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/es/index.wml
===================================================================
--- website/trunk/es/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/es/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -65,16 +65,13 @@
 Tor para usted.</p>
 
 <p>
-La seguridad de Tor se ve mejorada a medida que crece su base de usuarios y
-aumenta el nÃmero de voluntarios que <a href="<page
-docs/tor-doc-relay>">ejecuta repetidores</a>. (No es tan difÃcil de
-configurar como podrÃa pensar, y puede <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>mejorar
-de forma significativa su propia seguridad contra algunos ataques</a>.) Si
-ejecutar un repetidor no es lo suyo, necesitamos <a href="<page
-volunteer>">ayuda con muchos otros aspectos del proyecto</a>, y necesitamos
-fondos para continuar haciendo la red Tor mÃs rÃpida y fÃcil de usar
-manteniendo una buena seguridad.</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="<wiki>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 es una organizaciÃn sin animo de lucro 501(c)(3) en Estados Unidos cuya
 misiÃn es proteger su trÃfico de Internet para evitar anÃlisis. Por favor
@@ -86,11 +83,10 @@
 <div class="underline"></div>
 
 <ul>
-<li>02 de mayo 2010: Tor 0.2.1.26 marcado como estable. Soluciona problemas de
-compatibilidad aÃn mÃs OpenSSL y relÃs permite defenderse de las
-inundaciones de conexiÃn. Lea el <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>anuncio</a>
-con las actualizaciones y cambios.</li>
+<li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
+compatibility issues and lets relays defend themselves from connection
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
+announcement</a> for the list of changes.</li>
 <li>29 de Marzo de 2010: Tor y Printfection anuncian la tienda Tor.  MÃs
 detalles disponible en: <a href="<page
 press/2010-03-25-tor-store-press-release>">comunicado de prensa</a>.</li>

Modified: website/trunk/et/bridges.wml
===================================================================
--- website/trunk/et/bridges.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/et/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -39,12 +39,12 @@
 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>.
+href="<wiki>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>
@@ -146,8 +146,8 @@
 sildreleed. Sa vÃid selle konfigureerida kahel moodusel:
 <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 />
+href="<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit your torrc
+file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -162,8 +162,8 @@
 
 <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>.
+href="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/et/download.wml
===================================================================
--- website/trunk/et/download.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/et/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -248,12 +248,11 @@
 <li>
 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.
+<a href="<wiki>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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fa/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -40,12 +40,12 @@
 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>.
+href="<wiki>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>
@@ -152,8 +152,8 @@
 ØØØØ ÙÙÙØ. ØÙØ ÙÙâØÙØÙÙØ ØÙØØ ØØ ØÙÙ ØØÙ ØÙØÙÙ ÙÙÙØ:
 <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 />
+href="<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit your torrc
+file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -168,8 +168,8 @@
 
 <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>.
+href="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/fa/download.wml
===================================================================
--- website/trunk/fa/download.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fa/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -247,12 +247,11 @@
 <li>
 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.
+<a href="<wiki>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/download.wml
===================================================================
--- website/trunk/fi/download.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fi/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -249,12 +249,11 @@
 <li>
 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.
+<a href="<wiki>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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fi/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -67,11 +67,10 @@
 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>
+href="<wiki>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
@@ -85,8 +84,7 @@
 <ul>
 <li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
 compatibility issues and lets relays defend themselves from connection
-floods.  Read the <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>full
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
 announcement</a> for the list of changes.</li>
 <li>29 Maaliskuuta 2010: Tor ja Printfection julkistivat The Tor Store:n. LisÃÃ
 <a href="<page

Modified: website/trunk/fr/bridges.wml
===================================================================
--- website/trunk/fr/bridges.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -37,18 +37,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 expÃrimenter, lisez 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="<wiki>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>
@@ -160,9 +158,9 @@
 pouvez faire fonctionner un relais-passerelle à la place. Vous pouvez la
 configurer de la maniÃre suivante :
 <ul>
-<li> editer manuellement a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>votre
-fichier torrc</a> avec les quatre lignes qui suivent:<br />
+<li> manually <a
+href="<wiki>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>Si vous avez au dÃmarrage des erreurs du type: "Could not bind to
-0.0.0.0:443: Permission denied", vous devez utiliser un numÃro de port
-ORPort plus Ãlevà (ex: 8080) ou mettre en place <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>des
-translations de port ÃvoluÃes<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="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/fr/contact.wml
===================================================================
--- website/trunk/fr/contact.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/contact.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -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://trac.torproject.org/projects/tor/wiki";>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="<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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/documentation.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -40,43 +40,35 @@
 </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 d'un client ou d'un relais, concernant les attaques sur
-l'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> distincte
-pour rÃpondre aux questions frÃquentes posÃes par ou pour les 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 relatifs au Projet Tor aux
-Ãtats-Unis. 
+Our <a href="<wiki>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 paramÃtres
-possibles que vous pouvez mettre dans votre fichier <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc";>torrc</a>.
-Nous fournissons Ã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="<wiki>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, en particulier 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 systÃme de suivi de
-bogues</a>. (Si votre bug concerne Polipo, votre navigateur, ou d'autres
-applications, merci de ne pas le rentrer dans notre systÃme de suivi de
-bogues.) 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="<wiki>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>
-<a href="https://blog.torproject.org/";>Tor a maintenant un blog</a>. Nous
-essayons de le garder à jour toutes les une à deux semaines avec les
-derniÃres nouvelles.
+<a href="<blog>">Tor has a blog now</a>.  We try to keep it updated every
+week or two with the latest news.
 </li>
 
 <li>
@@ -243,8 +235,8 @@
 extensions par Tor</a></li>
 <li><a href="<gitblob>doc/spec/version-spec.txt">Comment sont numÃrotÃs les
 versions de Tor</a></li>
-<li><a href="<gitblob>doc/spec/proposals">Travail en cours sur les nouvelles
-spÃcifications et sur les changements proposÃs</a></li>
+<li><a href="<gittree>doc/spec/proposals">In-progress drafts of new
+specifications and proposed changes</a></li>
 </ul></li>
 
 </ul>
@@ -252,13 +244,10 @@
 <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 pertinentes faites par les
-utilisateurs de Tor. Jetez-y un coup d'oeil !</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>
+<li>The <a href="<wiki>">Tor wiki</a> provides a plethora of helpful
+contributions from Tor users. Check it out!</li>
+<li><a href="<wiki>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-unix.wml
===================================================================
--- website/trunk/fr/download-unix.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/download-unix.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -72,8 +72,7 @@
 <td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>
 <td>
 <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br /> <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/OpenbsdChrootedTor";>Guide
-du "chrooting" de Tor dans OpenBSD</a>
+href="<wiki>OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>
 </td>
 </tr>
 
@@ -232,14 +231,12 @@
 </li>
 
 <li>
-Tor anonymise l'origine de votre trafic et chiffre tout à l'intÃrieur du
-rÃseau Tor, mais <a
-href="https://trac.torproject.org/projects/tor/wiki/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
-employer autant de prÃcautions que lorsque vous Ãtes sur l'internet normal
-&mdash; utilisez HTTPS ou un chiffrement final similaire et des mÃcanismes
-d'authentification. 
+Tor anonymizes the origin of your traffic, and it encrypts everything inside
+the Tor network, but <a href="<wiki>TorFAQ#ExitEavesdroppers">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/download.wml
===================================================================
--- website/trunk/fr/download.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -254,14 +254,13 @@
 </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
-les mÃmes prÃcautions que lorsque vous Ãtes sur Internet  &mdash; utilisez
-HTTPS ou des mÃcanismes similaires de chiffrement point à point et
-d'authentification .
+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="<wiki>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-abuse.wml
===================================================================
--- website/trunk/fr/faq-abuse.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/faq-abuse.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -277,13 +277,11 @@
 libertà d'expression. Les inviter sur le canal #tor sur irc.oftc.net peut
 aussi leur montrer que nous ne sommes pas tous des "mÃchants". </p>
 
-<p>Enfin, si vous avez connaissance d'un rÃseau IRC qui semble interdire à Tor
-son accÃs, ou qui bloque un nÅud de sortie Tor, merci de faire figurer cette
-information dans la <a
-href="https://wiki.torproject.org/wiki/TheOnionRouter/BlockingIrc";>liste des
-rÃseaux IRC bloquant Tor</a> afin d'en informer les autres.  Au moins un
-rÃseau IRC consulte cette page pour dÃbloquer les nÅuds Tor qui ont ÃtÃ
-bannis par inadvertance. </p>
+<p>Finally, if you become aware of an IRC network that seems to be blocking
+Tor, or a single Tor exit node, please put that information on <a
+href="<wiki>BlockingIrc">The Tor IRC block tracker</a> so that others can
+share.  At least one IRC network consults that page to unblock exit nodes
+that have been blocked inadvertently. </p>
 
 <a id="SMTPBans"></a>
 <h3><a class="anchor" href="#SMTPBans">Les nÅuds de sortie Tor sont bannis du

Modified: website/trunk/fr/faq.wml
===================================================================
--- website/trunk/fr/faq.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/faq.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -49,7 +49,8 @@
 
 <p>Utiliser un client Tor:</p>
 <ul>
-<li><a href="#VidaliaPassword">Tor/Vidalia prompts for a password at start</a></li>
+<li><a href="#VidaliaPassword">Tor/Vidalia demande un mot de passe au
+dÃmarrage</a></li>
 <li><a href="#ChooseEntryExit">Puis-je contrÃler quels noeuds (ou pays) sont
 utilisÃs comme point d'entrÃe ou de sortie ?</a></li>
 </ul>
@@ -88,9 +89,8 @@
 noeud de sortie ?</a></li>
 </ul>
 
-<p>Pour les questions qui ne sont pas encore sur cette FAQ, consultez la <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ";>page FAQ
-sur le wiki</a>.</p>
+<p>For other questions not yet on this version of the FAQ, see the <a
+href="<wiki>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,17 +203,13 @@
 </p>
 
 <p>
-Il existe beaucoup d'autres programmes que vous pouvez utiliser avec Tor,
-mais nous n'avons pas suffisamment  Ãtudià les caractÃristiques relatives Ã
-l'anonymat au niveau applicatif pour chacun eux pour pouvoir recommander une
-configuration sÃcuritaire. Notre wiki fournit d'une liste d'instructions
-pour <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO";>
-Torifier des applications spÃcifiques</a>. Il y a Ãgalement une <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>
-liste des applications qui vous permettent de rediriger votre trafic Ã
-travers Tor</a>.  Merci de contribuer à 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="<wiki>TorifyHOWTO">Torifying specific applications</a>. There's
+also a <a href="<wiki>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>
@@ -407,10 +403,9 @@
 </p>
 
 <p>
-Pour des rÃponses plus prÃcises, consultez le <a
-href="https://blog.torproject.org/blog/why-tor-is-slow";>l'article du blog de
-Roger sur ce sujet</a>. qui inclus un PDF dÃtaillà et une prÃsentation
-vidÃo.
+For the much more in-depth answer, see <a
+href="<blog>why-tor-is-slow">Roger's blog post on the topic</a>, which
+includes both a detailed PDF and a video to go with it.
 </p>
 
 <p>
@@ -440,15 +435,13 @@
 </li>
 
 <li>
-Il y a quelques Ãtapes que les utilisateurs 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="<wiki>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>
@@ -809,9 +802,9 @@
 already running Tor. Vidalia generates a random password, but it is
 different than the saved password in the Tor service.  <br /> You need to
 reconfigure Tor to not be a service. See the FAQ entry on <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#HowdoIrunmyTorrelayasanNTservice";>running
-Tor as a Windows NT service</a> for more information on how to remove the
-Tor service.
+href="<wiki>TorFAQ#HowdoIrunmyTorrelayasanNTservice">running Tor as a
+Windows NT service</a> for more information on how to remove the Tor
+service.
 </li>
 </ol>
 
@@ -852,16 +845,13 @@
 non encore identifiÃs à ce jour.
 </p>
 <p>
-Les options de configuration <tt>EntryNodes</tt> et <tt>ExitNodes</tt> sont
-traitÃes comme une requÃte, c'est à dire si les noeuds sont en panne ou
-paraissent lents, Tor les Ãvitera.  Vous pouvez rendre l'option obligatoire
-en ajoutant <tt>StrictExitNodes 1</tt> ou <tt>StrictEntryNodes 1</tt>
-&mdash; mais si vous le faites, vos connexions Tor vont cesser de
-fonctionner si tous les nÅuds que vous avez spÃcifià deviennent
-inaccessibles. Consultez les <a
-href="https://www.torproject.org/documentation.html.fr#NeatLinks";>pages de
-statut de Tor</a> pour prendre connaissance des nÅuds que vous pouvez
-choisir.
+The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as
+a request, meaning if the nodes are down or seem slow, Tor will still avoid
+them.  You can make the option mandatory by setting <tt>StrictExitNodes
+1</tt> or <tt>StrictEntryNodes 1</tt> &mdash; but if you do, your Tor
+connections will stop working if all of the nodes you have specified become
+unreachable.  See the <a href="<page documentation>#NeatLinks">Tor status
+pages</a> for some nodes you might pick.
 </p>
 <p>
 Au lieu de <tt>$fingerprint</tt>, vous pouvez Ãgalement spÃcifier un code de
@@ -886,13 +876,10 @@
 </p>
 
 <ul>
-<li>Tor intrÃgre une gestion <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth";>de
-limites de dÃbit</a>. De plus, si vous avez un lien rapide mais que vous
-dÃsirez limiter le nombre d'octets que vous offrez 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="<wiki>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="<wiki>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
@@ -909,12 +896,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
-de chaque systÃme d'exploitation mais <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>cette
-entrÃe de la FAQ</a> montre quelques exemples pour 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="<wiki>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
@@ -933,36 +919,30 @@
 </p>
 
 <p>
-Chaque relais Tor a une politique de sortie qui spÃcifie quelles sont les
-connexions sortantes autorisÃes ou refusÃes depuis un relais. Les stratÃgies
-de sortie sont propagÃes vers les clients Tor via l'annuaire, de maniÃre Ã
-ce que les clients Ãvitent automatiquement les relais de sortie qui
-refuseraient d'accÃder à la destination voulue. Ainsi, chaque relais peut
-dÃcider des services, hÃtes et rÃseaux vers lesquels il veut autoriser des
-connexions, cette politique est basÃe sur sa propre situation et sur les
-abus potentiels. Lisez l'article de la FAQ Ã propos des <a href ="<page
-faq-abuse>#TypicalAbuses"> problÃmes que vous pourriez rencontrer si vous
-utilisez la politique par dÃfaut</a>, et lisez ensuite les <a
-href="https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment";>
-conseils de Mike Perry pour faire fonctionner un noeud de sortie avec un
-harcÃlement minimal</a>.
+Each Tor relay has an exit policy that specifies what sort of outbound
+connections are allowed or refused from that relay. The exit policies are
+propagated to Tor clients via the directory, so clients will automatically
+avoid picking exit relays that would refuse to exit to their intended
+destination. This way each relay can decide the services, hosts, and
+networks he wants to allow connections to, based on abuse potential and his
+own situation. Read the FAQ entry on <a href="<page
+faq-abuse>#TypicalAbuses">issues you might encounter</a> if you use the
+default exit policy, and then read Mike Perry's <a
+href="<blog>tips-running-exit-node-minimal-harassment">tips for running an
+exit node with minimal harassment</a>.
 </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 (courriel 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 spÃcifie 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="<wiki>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="<wiki>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>
@@ -1035,11 +1015,9 @@
 le processus compilà de Tor la reconnaÃtra automatiquement et utilisera
 cette fonctionnalitÃ.</li>
 
-<li>Si vous utilisez Solaris, OpenBSD, NetBSD ou un ancien FreeBSD, Tor dÃtache
-probablement ses processus plutÃt que d'utiliser des "threads". Envisagez de
-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="<wiki>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
@@ -1147,18 +1125,15 @@
 utilisateur de Tor soit un noeud.</a></h3>
 
 <p>
-Exiger que chaque utilisateur de Tor soit un relais 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 relais, par
-exemple, certains 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 un
-aspect important pour la prÃservation de l'anonymat pour tout le monde,
-Ãtant donnà que de nombreux utilisateurs de Tor sont soumis à ce genre de
-contrainte et que prendre en compte ces clients augmente la couverture des
-services d'anonymat.
+Requiring every Tor user to be a relay would help with scaling the network
+to handle all our users, and <a href="<wiki>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>
@@ -1186,14 +1161,13 @@
 </p>
 
 <p>
-Ensuite, nous avons besoin de progresser sur l'estimation automatique de la
-quantità adÃquate 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 relais 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="<wiki>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>
@@ -1225,11 +1199,10 @@
 </p>
 
 <p>
-CinquiÃmement, nous aurions besoin d'une sorte de systÃme d'incitation pour
-encourager les gens à relayer le trafic pour les autres, et / ou à devenir
-des nÅuds de sortie. Voici nos <a
-href="https://blog.torproject.org/blog/two-incentive-designs-tor";>rÃflexions
-sur les incitation à propos de Tor</a>.
+Fifth, we might need some sort of incentive scheme to encourage people to
+relay traffic for others, and/or to become exit nodes. Here are our <a
+href="<blog>two-incentive-designs-tor">current thoughts on Tor
+incentives</a>.
 </p>
 
 <p>
@@ -1250,9 +1223,8 @@
 propros de mon noeud de sortie ?</a></h3>
 
 <p>
-Un ensemble 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="<wiki>TorAbuseTemplates">collected here</a>.
 </p>
 
 <hr />

Modified: website/trunk/fr/hidden-services.wml
===================================================================
--- website/trunk/fr/hidden-services.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/hidden-services.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Whatsthisaboutentryguardformerlyknownashelpernodes";>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="<wiki>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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -69,16 +69,13 @@
 peut pas faire pour vous</a>.</p>
 
 <p>
-La sÃcurità de Tor s'accroÃt avec le nombre d'utilisateurs et le nombre de
-volontaires pour <a href="<page docs/tor-doc-relay>">faire tourner un
-relais</a>. (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 exÃcuter un relais, nous avons besoin d' <a href="<page volunteer>">aide
-sur plusieurs autres aspects 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="<wiki>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
@@ -90,11 +87,10 @@
 <div class="underline"></div>
 
 <ul>
-<li>02 mai 2010: Tor 0.2.1.26 sort en version stable.  De nombreux problÃmes de
-compatibilità OpenSSL ont Ãtà rÃsolus et cette version permet aux relais de
-se dÃfendre en cas de trop-plein de connexions. Lisez l'<a
-href="https://blog.torproject.org/blog/tor-02120-released";>annonce</a> pour
-connaÃtre les changements.</li>
+<li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
+compatibility issues and lets relays defend themselves from connection
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
+announcement</a> for the list of changes.</li>
 <li>29 mars 2010: Tor et Printfection lancent la Tor Store.  Plus de dÃtails
 sont disponibles dans le <a href="<page
 press/2010-03-25-tor-store-press-release>">communiquà de presse</a>.</li>

Deleted: website/trunk/fr/news.wml
===================================================================
--- website/trunk/fr/news.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/news.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -1,190 +0,0 @@
-
-
-
-
-
-
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor: News" CHARSET="UTF-8"
-<div class="main-column">
-
-
-
-<!-- PUT CONTENT AFTER THIS TAG -->
-<a id="News"></a>
-<h2><a class="anchor" href="#News">Tor: News</a></h2>
-<div class="underline"></div>
-
-<ul>
-<li>02 Mai 2010: version stable de Tor 0.2.1.26. Corrige davantage les problÃmes
-liÃs à OpenSSL et permet aux relais de se dÃfendre contre les dÃnis de
-service. Consultez <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>l'annonce
-complÃte</a> pour la liste des changements.</li>
-<li>29 mars 2010: Tor et Printfection lancent la Tor Store.  Plus de dÃtails
-sont disponibles dans le <a href="<page
-press/2010-03-25-tor-store-press-release>">communiquà de presse</a>.</li>
-<li>16 mars 2010: version stable de Tor 0.2.1.25.  Corrige une rÃgression
-introduite dans la version 0.2.1.23 qui pouvait empÃcher les relais de
-dÃcouvrir leur adresse IP correctement. Corrige Ãgalement plusieurs failles
-mineures de sÃcuritÃ. Consultez l'<a
-href="http://archives.seul.org/or/announce/Mar-2010/msg00000.html";>annonce
-complÃte</a> pour obtenir la liste des Ãvolutions.</li>
-<li>21 fÃvrier 2010: version stable de Tor 0.2.1.24.  Corrige les problÃmes de
-compatibilità avec les changements rÃcents d'OpenSSL sous Apple OSX et
-amÃliore lÃgÃrement les performances.  Consultez l'<a
-href="http://archives.seul.org/or/announce/Feb-2010/msg00000.html";>annonce</a>
-pour obtenir la liste complÃte des Ãvolutions.</li>
-<li>19 janvier 2010: version stable de Tor 0.2.1.22.  Corrige un problÃme
-critique concernant les annuaires de passerelles.  Cette mise à jour change
-Ãgalement les clefs et les adresses de deux des sept autoritÃs
-d'annuaires. Consultez <a
-href="http://archives.seul.org/or/announce/Jan-2010/msg00000.html";>l'annonce</a>
-pour obtenir la liste complÃte des corrections.</li>
-<li>21 dÃcembre 2009: Tor 0.2.1.21 sort en version stable.  Elle corrige
-certains problÃmes relatifs à OpenSSL et amÃliore les noeuds terminaux.
-Lisez <a
-href="http://archives.seul.org/or/announce/Dec-2009/msg00000.html";>l'annonce</a>
-pour obtenir la liste complÃte des corrections. </li>
-<li>10 octobre 2009: Tor 0.2.1.20 sort en version stable.  Lisez <a
-href="https://blog.torproject.org/blog/tor-02120-released";>l'annonce</a> sur
-les changements et les amÃliorations.</li>
-<li>28 juillet 2009: Tor 0.2.1.19 sort en version stable.  Lisez <a
-href="http://archives.seul.org/or/announce/Aug-2009/msg00000.html";>l'annonce</a>
-sur les changements et les amÃliorations.</li>
-<li>25 juin 2009: Tor 0.2.0.35 sort en version stable.  Lisez <a
-href="http://archives.seul.org/or/announce/Jun-2009/msg00000.html";>l'annonce</a>
-sur les changements et les amÃliorations.</li>
-<li>12 mars 2009: Tor lance une campagne et une feuille de route sur
-l'amÃlioration des performances.  Lisez <a href="<page
-press/2009-03-12-performance-roadmap-press-release>">la coupure de
-presse</a> pour plus d'informations.</li>
-<li>09 fÃvrier 2009: Tor 0.2.0.34 sort en version stable.  Lisez <a
-href="http://archives.seul.org/or/announce/Feb-2009/msg00000.html";>l'annonce</a>
-sur les changements et les amÃliorations.  Cette version corrige une faille
-de sÃcuritÃ.</li>
-<li>21 janvier 2009: Tor 0.2.0.33 sort en version stable.  Lisez <a
-href="http://archives.seul.org/or/announce/Jan-2009/msg00000.html";>l'annonce</a>
-sur les changements et les amÃliorations.</li>
-<li>19 dÃcembre 2008: Tor publie sa feuille de route de dÃveloppement pour les 3
-annÃes à venir.  Lisez <a href="<page
-press/2008-12-19-roadmap-press-release>">la coupure de presse</a> pour plus
-d'informations.</li>
-<li>05 dÃcembre 2008: Tor 0.2.0.32 sort en version stable.  Lisez <a
-href="http://archives.seul.org/or/announce/Dec-2008/msg00000.html";>l'annonce</a>
-sur les changements et les amÃliorations.</li>
-<li>08 septembre 2008: Tor 0.2.0.31 sort en version stable. Lisez <a
-href="http://archives.seul.org/or/announce/Sep-2008/msg00000.html";>l'annonce</a>
-sur les changements et les amÃliorations.</li>
-<li>25 aoÃt 2008: Tor 0.2.0.30 sort en version stable.  Lisez <a
-href="http://archives.seul.org/or/announce/Aug-2008/msg00000.html";>l'annonce</a>
-ou <a
-href="https://blog.torproject.org/blog/tor-0.2.0.30-released-stable";>l'article
-de blog</a> sur les nombreux changements et les amÃliorations.</li>
-<li>25 mai 2008: Tor a reÃu deux prix de <a href="http://nlnet.nl/";>la Fondation
-NLnet</a>. Le premier pour l'amÃlioration des performances des services
-cachÃs. Le second afin de rendre Tor plus efficace pour les clients à faible
-bande passante. La <a
-href="http://nlnet.nl/news/2008/20080514-awards.html";>page NLnet des
-rÃcompenses</a> dÃtaille un peu plus ces deux projets.</li>
-
-<li>13 mai 2008: <a
-href="http://archives.seul.org/or/talk/May-2008/msg00048.html";>Tor
-0.2.0.26-rc</a> remplace plusieurs autoritÃs d'annuaires V3 dont les clÃs
-ont Ãtà affectÃes par un <a
-href="http://lists.debian.org/debian-security-announce/2008/msg00152.html";>bug
-rÃcent d'OpenSSL sous Debian</a>.  <strong>Il s'agit d'une version de
-sÃcurità critique.</strong> Toute personne faisant tourner une version de la
-sÃrie 0.2.0.x devrait mettre à jour, qu'elle soit sous Debian ou non. De
-plus, tout serveur faisant tourner n'importe quelle version de Tor dont les
-clÃs ont Ãtà gÃnÃrÃes par Debian, Ubuntu, ou une distribution dÃrivÃe doit
-remplacer ses clÃs d'identification.  Consultez notre <a
-href="http://archives.seul.org/or/announce/May-2008/msg00000.html";>annonce
-de sÃcuritÃ</a> ou le <a
-href="https://blog.torproject.org/blog/debian-openssl-flaw%3A-what-does-it-mean-tor-clients%3F";>blog</a>
-pour plus de dÃtails.  Comme toujours, vous pouvez trouver Tor 0.2.0.26-rc
-sur <a href="https://www.torproject.org/download#Dev";>la page de
-tÃlÃchargement</a>.</li>
-<li>mars 2008: <a
-href="https://blog.torproject.org/blog/tor-project-google-summer-code-2008!";>Le
-Projet Tor est dans le  Google Summer of Code 2008 ! Â</a></li>
-
-<li>fÃvrier 2008: Le <a href="https://www.torproject.org/people#Board";>Conseil
-d'Administration</a> accueille <a
-href="https://blog.torproject.org/blog/isaac-mao-elected-one-our-new-directors";>Isaac
-Mao</a> au Conseil. Nous remercions Rebecca McKinnon pour son soutien et ses
-contributions au projet.</li>
-
-<li>fÃvrier 2008: Tor est heureux de vous annoncer l'ouverture du <a
-href="https://blog.torproject.org";>blog Tor officiel</a>.</li>
-
-<li>janvier 2008: <a href="<page download>">Tor 0.1.2.19</a> (la derniÃre
-version stable) corrige une grosse fuite mÃmoire sur les relais de sortie,
-rend les rÃgles de sortie par dÃfaut un peu plus conservatrices ce qui donne
-un peu plus de sÃcurità pour faire tourner un relais sur un ordinateur
-domestique, et corrige une collection de problÃmes de moindre
-importance. Merci de vous mettre à jour. L'ensemble des <a
-href="http://archives.seul.org/or/announce/Jan-2008/msg00000.html";>notes de
-version</a> sont disponibles.</li>
-
-<li>octobre 2007: <a href="<page download>">Tor 0.1.2.18</a> (la nouvelle
-version stable) corrige plusieurs problÃmes dont certains de stabilitÃ, un
-problÃme avec les ajouts de services cachÃs qui causait de longs dÃlais, et
-un gros bug qui faisait que certains serveurs disparaissaient de la liste
-d'Ãtat du rÃseau pendant quelques heures par jour. Nous avons Ãgalement
-modifià la configuration par dÃfaut de Privoxy dans les Packs pour Ãviter
-certains problÃmes de sÃcuritÃ, donc assurez-vous de laisser "install
-Privoxy" cochà lorsque vous mettez à jour. Consultez <a
-href="http://archives.seul.org/or/announce/Oct-2007/msg00000.html";>l'annonce
-de version</a> pour plus d'informations.</li>
-
-<li>octobre 2007: Comme beaucoup d'entre vous le savent dÃjÃ, le Projet Tor est
-devenu une <a href="<page people>">organisation indÃpendante et
-officiellement à but non lucratif</a> depuis fÃvrier dernier. Nous avons
-fait cela afin de pouvoir obtenir des <a href="<page donate>">dons</a> de la
-part d'organisations qui donnent seulement aux ONG, et pour que nos
-donateurs puissent dÃduire leurs dons des impÃts.<br /> Nous souhaitons
-remercier chaleureusement <a href="https://www.eff.org/";>l'Electronic
-Frontier Foundation</a> pour leur soutien passÃ, leur concours fiscal, et
-l'aide apportÃe dans l'hÃbergement d'une partie de notre site web, ainsi que
-leurs apports continus dans notre jeune organisation à but non lucratif. </li>
-
-<li>septembre 2007: Si vous avez reÃu un mail prÃtendant venir de Tor, il ne
-venait pas de nous. Les <a href="<page download>">paquets officiels de
-Tor</a> peuvent Ãtre <a href="<page verifying-signatures>">vÃrifiÃs comme
-Ãtant authentiques</a>.</li>
-
-<li>aoÃt 2007: <strong>Mettez à jour votre logiciel Tor !</strong> Les derniÃres
-versions (stable: 0.1.2.17; dÃveloppement: 0.2.0.6-alpha) corrigent un
-important problÃme de sÃcuritÃ.  Consultez <a
-href="http://archives.seul.org/or/announce/Aug-2007/msg00000.html";>l'annonce
-de la version</a> pour plus d'informations.</li>
-
-<li>fÃvrier 2007: Le Project Tor et UColo/Boulder <a
-href="http://blogs.law.harvard.edu/anonymous/2007/02/26/the-rumors-of-our-demise/";>rÃpondent</a>
-à la rÃcente fiÃvre qui a agità certains blogs à propos d'un article
-relatant une stratÃgie d'attaque possible contre Tor.</li>
-
-<li>janvier 2007 : Le rÃseau Tor compte maintenant plusieurs centaines Ã
-plusieurs milliers d'utilisateurs. Les dÃveloppeurs ne suffisent plus Ã
-assurer l'ajout de nouvelles fonctionnalitÃs, les corrections de bugs, et la
-rÃdaction de la documentation. <a href="<page volunteer>">Nous avons besoin
-de votre aide !</a></li>
-
-<li><b>Nous recherchons activement de nouveaux sponsors et de nouveaux
-fonds.</b> Si votre organisation peut contribuer à rendre le rÃseau Tor plus
-utilisable et plus rapide, <a href="<page contact>">contactez-nous</a>. Les
-sponsors du projet Tor bÃnÃficient d'une attention particuliÃre, d'un
-meilleur support technique, de publicità (s'ils le souhaitent), et peuvent
-influer sur le cours des recherches et du dÃveloppement.  <a href="<page
-donate>">Merci de nous aider financiÃrement.</a></li>
-
-</ul>
-
-</div>
-
-
-
-#include <foot.wmi>

Modified: website/trunk/fr/people.wml
===================================================================
--- website/trunk/fr/people.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/people.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -233,11 +233,9 @@
 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://trac.torproject.org/projects/tor/wiki/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="<wiki>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
@@ -264,20 +262,20 @@
 href="https://svn.torproject.org/svn/topf/trunk/README";>TOPF</a>, un
 gÃnÃrateur de bruit pour Tor; encadrà par Roger.</dd>
 <dt>Ren Bucholz</dt><dd>Nos superbes logos et images.</dd>
-<dt>Fallon Chen</dt><dd> A travaillà sur l'amÃlioration de la sÃlection des chemins dans Tor (<a
-href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/";>svn</a>)
-et sur <a
-href="<gitblob>doc/spec/proposals/151-path-selection-improvements.txt">la
-proposition 151</a> lors du Google Summer of Code 2008.</dd>
+<dt>Fallon Chen</dt><dd> Worked on Improving Tor Path Selection (<a
+href="https://svn.torproject.org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/";>svn</a>)
+and <a
+href="<gitblob>doc/spec/proposals/151-path-selection-improvements.txt">proposal
+151</a> as part of Google Summer of Code 2008.</dd>
 <dt>Bram Cohen</dt><dd>Nous a aidà à concevoir nos mÃcanismes de contrÃle de congestion au dÃbut du
 projet.</dd>
 <dt>Pat Double</dt><dd>CrÃateur du LiveCD Incognito.</dd>
 <dt>Geoff Goodell</dt><dd>A lancà le <a href="https://svn.torproject.org/svn/blossom/trunk/";>projet
 Blossom</a> qui utilise Tor comme rÃseau dÃdiÃ. Apporte son concours Ã
 rendre l'interface de contrÃle de Tor la plus souple possible.</dd>
-<dt>Aleksei Gorny</dt><dd> Travaille sur l'amÃlioration du scanner des noeuds de sortie Tor (<a
-href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/";>svn</a>),
-dÃmarrà originellement lors du Google Summer of Code 2008.</dd>
+<dt>Aleksei Gorny</dt><dd> Working on Tor exit scanner improvements (<a
+href="https://svn.torproject.org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/";>svn</a>),
+originally started as part of Google Summer of Code 2008.</dd>
 <dt>Christian Grothoff</dt><dd> A contribuà à l'amÃlioration de la mise en dÃmon.</dd>
 <dt>Steven Hazel</dt><dd> A fait en sorte que 'make install' fasse ce qu'on attende de lui.</dd>
 <dt>Justin Hipple</dt><dd>L'autre dÃveloppeur de Vidalia.</dd>
@@ -313,10 +311,9 @@
 biographie complÃte sur <a
 href="http://www.eff.org/about/staff/?f=fred_von_lohmann.html";>le site du
 personnel de l'EFF</a>.</dd>
-<dt>Christian Wilms</dt><dd> A travaillà sur l'amÃlioration des performances des services cachÃs de Tor
-(<a
-href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";>svn</a>)
-lors du Google Summer of Code 2008.</dd>
+<dt>Christian Wilms</dt><dd> Worked on Performance Enhancing Measures for Tor Hidden Services (<a
+href="https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-perf/";>svn</a>)
+as part of Google Summer of Code 2008.</dd>
 <dt>Jillian C. York</dt><dd><a href="http://jilliancyork.com/";>Jillian C. York</a> est un Ãcrivain, une
 blogueuse et une activiste rÃsidant à Boston. Elle blogue sur l'utilisation
 de Tor et sur l'anonymat sur <a

Modified: website/trunk/fr/sponsors.wml
===================================================================
--- website/trunk/fr/sponsors.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/sponsors.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -26,14 +26,15 @@
 
 <h3><i>Liliopsida</i> (jusqu'Ã 750000 $)</h3>
 	<ul>
-		<li><a href="http://www.bbg.gov/";>Broadcasting Board of Governors</a>
+		<li><a href="http://www.bbg.gov/";>Bureau de diffusion des Gouvernements</a>
 (2006-2010)</li>
 	</ul>
 
 <h3><i>Asparagales</i> (jusqu'Ã 500000 $)</h3>
 	<ul>
 		<li>Une ONG anonyme europÃenne (2006-2008)</li>
-        <li><a href="http://www.nsf.gov/";>National Science Foundation</a></li>
+        <li><a href="http://www.nsf.gov/";>Fondation Nationale pour la Science</a>
+(2008-2009)</li>
 	</ul>
 
 <h3><i>Alliaceae</i> (jusqu'Ã 200000 $)</h3>

Modified: website/trunk/fr/tormedia.wml
===================================================================
--- website/trunk/fr/tormedia.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/tormedia.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -146,11 +146,11 @@
 </thead>
 
 <tr>
-<td>2010 August 01</td>
-<td>PC Format - Poland</td>
+<td>1er aoÃt 2010</td>
+<td>PC Format Pologne</td>
 <td><a
 href="http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci";>Google
-and Facebook are spying on us</a></td>
+et Facebook nous espionnent</a></td>
 </tr>
 <tr style="background-color: #e5e5e5;">
 <td>14 juillet 2010</td>
@@ -469,11 +469,11 @@
 <td>1er fÃvrier 2008</td>
 <td>PC World</td>
 <td><a href="http://www.pcworld.com/article/id,142094-pg,1/article.html";>
-Hackers Can Expose Masked Surfers, Study Says</a> Un rapport sur <a
+Hackers Can Expose Masked Surfers, Study Says</a> A report on <a
 href="http://www.lightbluetouchpaper.org/2007/12/10/covert-channel-vulnerabilities-in-anonymity-systems/";>
-la rÃcente thÃse de Steven Murdoch</a>. <a
-href="http://blog.torproject.org/blog/media-coverage-%2526quot%3Bcovert-channel-vulnerabilities-anonymity-systems%2526quot%3B";>
-La rÃponse de Steven sur le blog de Tor</a>.</td>
+Steven Murdoch's recent PhD thesis</a>. Steven <a
+href="<blog>media-coverage-%2526quot%3Bcovert-channel-vulnerabilities-anonymity-systems%2526quot%3B">
+responds on the Tor Blog</a>.</td>
 </tr>
 <tr style="background-color: #e5e5e5;">
 <td>21 septembre 2007</td>

Modified: website/trunk/fr/trademark-faq.wml
===================================================================
--- website/trunk/fr/trademark-faq.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/trademark-faq.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -30,13 +30,14 @@
 
 <a id="onionlogo"></a>
 <h2>Puis-je utiliser le logo oignon de Tor ?</h2>
-<p>If you're making non-commercial use of Tor software, you may also use the
-Tor onion logo (as an illustration, not as a brand for your products).
-Please don't modify the design or colors of the logo.  You can use items
-that look like the Tor onion logo to illustrate a point (e.g. an exploded
-onion with layers, for instance), so long as they're not used as logos in
-ways that would confuse people. As a general guideline, the Tor Project logo
-should not be the dominant image on a page.</p>
+<p>Si vous faites un usage non-commercial du logiciel Tor, vous pouvez
+Ãgalement utiliser le logo en oignon de Tor (Ã titre d'illustration, et non
+comme une marque de vos produits).  Merci de ne pas modifier la forme ou les
+couleurs du logo.  Vous pouvez utiliser les images qui ressemblent au logo
+en oignon de Tor pour illustrer un point (ex: un Ãclatà d'oignon avec des
+couches, en l'occurrence), tant qu'ils sont pas utilisÃs comme des logos
+risquant d'induire en erreur les personnes. Gardez à l'esprit que le logo du
+projet Tor ne doit pas Ãtre l'image dominante d'une page.</p>
 
 <a id="combining"></a>
 <h2>Puis-je utiliser le mot "Tor" dans le cadre du nom de mon produit ou mon nom

Modified: website/trunk/fr/translation-overview.wml
===================================================================
--- website/trunk/fr/translation-overview.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/translation-overview.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -47,13 +47,13 @@
 </p>
 
 <p>
-Pour dÃbuter la traduction en utilisant le portail de traduction, vous devez
-y ouvrir un compte. Pour commencer, visitez <a
-href="https://translation.torproject.org/register.html";>la page de crÃation
-de compte</a>. Assurez-vous de saisir une adresse e-mail valide et un mot de
-passe robuste. AprÃs avoir rempli le formulaire et utilisà le bouton
-'Register Account', vous devriez voir un texte indiquant que les choses se
-sont bien dÃroulÃes: 
+To get started using our translation website, you need to sign up for an
+account. Visit the <a
+href="https://translation.torproject.org/accounts/register/";>account
+registration page</a> to get started. Be sure to enter a proper email
+address and a strong password. After you fill in the form and use the
+'Register Account' button, you should see some text indicating that things
+worked out: 
 </p>
 <pre>
 Account created. You will be emailed login details and an activation code.
@@ -130,15 +130,15 @@
 </p>
 
 <p>
-Lorsque vous avez terminÃ, vous validerez vos changements en retournant à la
-page <a
-href="https://translation.torproject.org/fr/vidalia/index.html?editing=1";>Editing
-Functions</a>. et en cliquant sur le lien "<a
-href='https://translation.torproject.org/de/vidalia/index.html?editing=1&amp;docommit=1&amp;commitfile=vidalia_de.po'>Commit</a>".
-Cela validera vos changements dans le <a
-href="https://svn.torproject.org/svn/translation/trunk/projects/vidalia/fr/";>Module
-subversion de traduction</a> dans la partie spÃcifique correspondant à vos
-choix de langue et de projet (Vidalia et FranÃais, pour cet example). 
+When you're finished, you need to commit your changes. Return to the page
+with the <a
+href="https://translation.torproject.org/de/vidalia/index.html?editing=1";>Editing
+Functions</a>, and click on the "<a
+href='https://translation.torproject.org/de/vidalia/index.html?editing=1&amp;docommit=1&amp;commitfile=vidalia_de.po'>Commit</a>"
+link. This will commit your changes into the <a
+href="https://trac.vidalia-project.net/browser/vidalia/trunk/src/vidalia/i18n";>Translation
+subversion module</a> in the specific area as specified by your choices of
+language and project (Vidalia and German, for this example).
 </p>
 
 <p>

Deleted: website/trunk/fr/tshirt.wml
===================================================================
--- website/trunk/fr/tshirt.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/tshirt.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor: T-shirt" CHARSET="UTF-8"
-<div class="main-column">
-
-<h2>Tor: Contribuer pour obtenir un T-shirt</h2>
-<hr />
-
-<p>Vous pouvez obtenir un des superbes T-Shirt Tor en contribuant au projet
-Tor. Il existe trois maniÃres de contribuer:</p>
-
-<ol>
-<li>Une <a href="<page donate>">donation<a> suffisante en argent (+ de 65$) au
-Projet Tor.</li>
-<li>GÃrer un <a href="<page docs/tor-doc-relay>">relais Tor</a> rapide qui
-fonctionne depuis au moins les deux derniers mois : vous Ãtes Ãligible si
-vous autorisez les sorties vers le port 80 et que votre trafic moyen est de
-100KB/s ou bien si vous n'Ãtes pas un noeud de sortie mais que votre trafic
-moyen est de 500 KB/s.</li>
-<li>Aider de <a href="<page volunteer>">diffÃrerentes maniÃres</a>. <a
-href="<page translation>">Maintenir la traduction du site Web</a>. Ãcrire un
-bon <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>programme
-de support et avec de nombreuses personnes à s'en servir</a>. Faire de la
-recherche sur Tor et l'anonymat, corriger certains de <a
-href="https://bugs.torproject.org/";>nos bogues</a>, ou devenir vous-mÃme un
-partisan de Tor.
-</li>
-</ol>
-
-<p>
-Si vous rÃpondez à ces critÃres, envoyez un courriel à donations at
-torproject dot org avec une courte explication. Merci d'indiquer votre
-prÃfÃrence pour la couleur, une taille (S/M/L/XL/XXL), une autre taille si
-votre premier choix est indisponible, ainsi qu'une adresse pour l'envoi.
-</p>
-
-<p>
-Vous pouvez choisir entre le noir traditionnel et notre vert Ãclatant qui ne
-manquera pas de faire parler autour de vous. Vous pouvez Ãgalement voir les
-T-Shirts <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorShirt";>en
-action</a> &mdash; et Ãgalement ajouter vos propres photos .
-</p>
-
-<div style="text-align: center">
-<a href="tshirt/black-tor-tshirt.png"><img src="tshirt/black-tor-tshirt.png"
-/></a> <a href="tshirt/green-tor-tshirt.png"><img
-src="tshirt/green-tor-tshirt.png" /></a>
-</div>
-
-  </div>
-
-
-
-#include <foot.wmi>

Modified: website/trunk/fr/volunteer.wml
===================================================================
--- website/trunk/fr/volunteer.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/fr/volunteer.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -42,14 +42,11 @@
 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://trac.torproject.org/projects/tor/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://trac.torproject.org/projects/tor/wiki/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="<wiki>TorifyHOWTO">our list of programs</a>
+that can be configured to use Tor.</li>
+<li>We have a huge list of <a href="<wiki>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>
@@ -189,39 +186,33 @@
 </li>
 
 <li>
-<b>AmÃliorer les capacitÃs de rÃsistance à la censure de Tor</b> <br />
-PrioritÃ: <i>Moyenne à Haute</i> <br /> Effort à fournir: <i>Moyen Ã
-Important</i> <br /> CompÃtences requises: <i>Hautes</i> <br /> Tuteurs
-potentiels: <i>Nick, Roger, Steven</i> <br /> La sÃrie 0.2.1.x de Tor a fait
-l'objet <a href="<svnprojects>design-paper/blocking.html">d'amÃlioration
-sensibles</a> dans la rÃsistance aux censures des Ãtats et des
-organisations.  NÃanmoins, Tor a toujours besoin de meilleurs mÃcanismes
-dans certaines parties de ses fonctionnalitÃs anti-censure.  <br/> Une des
-catÃgories sur laquelle il faut centrer les efforts est l'ajout de
-fonctionnalitÃs à notre service Python <a
-href="http://gitweb.torproject.org//bridgedb.git?a=tree";>bridgedb</a>. Tor a
-pour objectif de distribuer des <a href="<page bridges>">adresses de
-passerelles</a> aux personnes qui ne peuvent accÃder directement au rÃseau
-Tor. NÃanmoins, il y a une course à l'Ãchalotte entre les algorithmes de
-distribution d'adresses et les algorithmes de collecte et de bloquage de ces
-derniÃres. Consultez notre <a
-href="https://blog.torproject.org/blog/bridge-distribution-strategies";>article
-de blog sur le sujet</a> comme introduction et <a
-href="http://archives.seul.org/or/dev/Dec-2009/msg00000.html";>le message de
-Roger du mois de dÃcembre sur la liste de diffusion or-dev</a> pour plus de
-dÃtails &mdash; un gros travail de spÃcification reste à accomplir.  <br />
-Si vous voulez mettre les mains dans le cambouis de Tor (en C), un problÃme
-moins important que nous devons gÃrer est le fait que Tor ne peut Ãcouter le
-rÃseau que sur une seule combinaison adresse/port à la fois. Il existe <a
-href="<gitblob>doc/spec/proposals/118-multiple-orports.txt">une proposition
-visant à rÃduire cette limite</a> et à permettre aux clients de se connecter
-Ã n'importe quel noeud Tor sur de multiples adresses et ports mais il y a
-besoin de plus de travail dessus.  <br /> Ce projet implique un gros travail
-de recherche et de conception. Un des dÃfis le plus important est
-d'identifier et de sÃlectionner des approches rÃsistantes aux attaques y
-compris lorsque l'attaquant en connaÃt la conception. Il sera alors possible
-de conjuguer rÃsistance à la censure avec facilità d'utilisation et
-robustesse.
+<b>Improving Tor's ability to resist censorship</b> <br /> Priority:
+<i>Medium to High</i> <br /> Effort Level: <i>Medium to High</i> <br />
+Skill Level: <i>High</i> <br /> Likely Mentors: <i>Roger, Nick, Steven</i>
+<br /> The Tor 0.2.1.x series makes <a
+href="<svnprojects>design-paper/blocking.html">significant improvements</a>
+in resisting national and organizational censorship.  But Tor still needs
+better mechanisms for some parts of its anti-censorship design.  <br /> One
+huge category of work is adding features to our <a
+href="http://gitweb.torproject.org//bridgedb.git?a=tree";>bridgedb</a>
+service (Python). Tor aims to give out <a href="<page bridges>">bridge relay
+addresses</a> to users that can't reach the Tor network directly, but
+there's an arms race between algorithms for distributing addresses and
+algorithms for gathering and blocking them. See <a
+href="<blog>bridge-distribution-strategies">our blog post on the topic</a>
+as an overview, and then look at <a
+href="http://archives.seul.org/or/dev/Dec-2009/msg00000.html";>Roger's or-dev
+post</a> from December for more recent thoughts &mdash; lots of design work
+remains.  <br /> If you want to get more into the guts of Tor itself (C), a
+more minor problem we should address is that current Tors can only listen on
+a single address/port combination at a time. There's <a
+href="<gitblob>doc/spec/proposals/118-multiple-orports.txt">a proposal to
+address this limitation</a> and allow clients to connect to any given Tor on
+multiple addresses and ports, but it needs more work.  <br /> This project
+could involve a lot of research and design. One of the big challenges will
+be identifying and crafting approaches that can still resist an adversary
+even after the adversary knows the design, and then trading off censorship
+resistance with usability and robustness.
 </li>
 
 <li>
@@ -577,13 +568,12 @@
 </li>
 
 <li>
-<b>Amener de nouvelles idÃes !</b> <br />Vous n'aimez aucune de celles qui
-sont prÃsentÃes ? Consultez <a
-href="<gitblob>doc/roadmaps/2008-12-19-roadmap-full.pdf">la feuille de route
-de dÃveloppement</a> pour vous donner d'autres idÃes ou bien essayez
-simplement Tor, Vidalia et Torbutton pour trouver quelles sont les points Ã
-amÃliorer.  Quelques-unes <a href="<gittree>doc/spec/proposals/">des
-propositions en cours</a> ont Ãgalement besoin de dÃveloppeurs.
+<b>Bring up new ideas!</b> <br /> Don't like any of these? Look at the <a
+href="<svnprojects>roadmaps/2008-12-19-roadmap-full.pdf">Tor development
+roadmap</a> for more ideas, or just try out Tor, Vidalia, and Torbutton, and
+find out what you think needs fixing.  Some of the <a
+href="<gittree>doc/spec/proposals">current proposals</a> might also be short
+on developers.
 </li>
 
 </ol>
@@ -592,19 +582,16 @@
 <h2><a class="anchor" href="#OtherCoding">Autres idÃes de spÃcifications et de
 code</a></h2>
 <ol>
-<li>Les relais Tor ne fonctionnent pas parfaitement sur Windows XP. Sous
-Windows, 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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/WindowsBufferProblems";>provoquant
-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="<wiki>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
@@ -635,28 +622,27 @@
 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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#YoushouldtransportallIPpacketsnotjustTCPpackets.";>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="<wiki>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,
 partir de là est sans doute un premier pas.</li>
 
-<li>We need a way to generate the website diagrams (for example, the "How Tor
-Works" pictures on the <a href="<page overview>">overview page</a> from
-source, so we can translate them as UTF-8 text rather than edit them by hand
-with image editors. We might want to integrate this as an wml file so
-translations are easy and images are generated in multiple languages
-whenever we build the website.</li>
+<li>Nous avons besoin de gÃnÃrer les diagrammes du site web (par exemple les
+images de "Comment fonctionne Tor ?" sur <a href="<page overview>">la page
+d'aperÃu</a> à partir d'une source de maniÃre à pouvoir les traduire comme
+du texte UTF-8 plutÃt que de les modifier à la main avec un Ãditeur
+d'image. Nous voudrions intÃgrer ce processus dans un fichier wml pour
+faciliter les traductions et regÃnÃrer les images en plusieurs langues
+lorsque nous construisons le site web.</li>
 
 <li>Comment pouvons-nous maintenir, amÃliorer et documenter plus facilement les
 diffÃrents systÃmes LiveCD/USB ? <a href="https://amnesia.boum.org/";>Le

Modified: website/trunk/it/bridges.wml
===================================================================
--- website/trunk/it/bridges.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/it/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -35,16 +35,16 @@
 </p>
 
 <p>
-Nota inoltre che à possibile che Tor possa non funzionare per altre
-ragioni. L'ultima versione di <a href="<page torbrowser/index>">The Tor
-Browser Bundle</a> per Windows prova a dare dei consigli per verificare la
-ragione per la quale Tor non si connette. Dovresti inoltre leggere <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>le
-FAQ relative al corretto funzionamento di Tor</a>: Se pensi proprio di non
-poter fare altrimenti oppure vuoi semplicemente provare perchà non sei
-sicuro o curioso continua a leggere. Assicurati di stare usando <a
-href="<page download>#Dev">la versione 0.2.1.x o 0.2.2.x per la tua
-piattaforma</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="<wiki>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>
@@ -105,9 +105,8 @@
 un Bridge" e cliccando sul segno "+" come nella figura sotto:
 </p>
 
-<br /><br />
-<img src="$(IMGROOT)/vidalia-bridges.png" alt="Pagina di configurazione del Network di Vidalia" /> 
-<br /><br />
+<br /><br /> <img src="$(IMGROOT)/vidalia-bridges.png" alt=\"Pagina di
+configurazione del Network di Vidalia" /> <br /><br />
 
 <p>
 à preferibile aggiungere tutti i bridge conosciuti perchà di migliora
@@ -150,9 +149,9 @@
 docs/tor-doc-relay>">normale nodo Tor</a> potresti gestire un bridge. Lo
 puoi configurare in questi modi:
 <ul>
-<li> configurando manualmente <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>il
-tuo file torrc</a> aggiungendo queste quattro linee:<br />
+<li> manually <a
+href="<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit your torrc
+file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -165,11 +164,10 @@
 </ul>
 </p>
 
-<p>Se ottieni l'errore "Could not bind to 0.0.0.0:443: Permission denied"
-all'avvio devi usare un'altra porta pià alta per ORPort (ad esempio 8080)
-oppure configurare <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>un
-complesso sistema di port forwarding</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="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/it/contact.wml
===================================================================
--- website/trunk/it/contact.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/it/contact.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -40,11 +40,10 @@
 <li><tt>tor-ops</tt> Viene ricevuto da coloro che gestiscono le directory
 autoritative. Da usare se si ha un relay Tor, per domande o problemi con il
 proprio relay.</li>
-<li><tt>tor-webmaster</tt> serve a correggere refusi sul sito web, correggere
-frasi o istruzioni sul sito e aggiungere nuove sezioni o paragrafi inviati
-dagli utenti. &#200; una buona idea creare prima una bozza delle nuove
-sezioni sul <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="<wiki>">the Tor wiki</a> first.</li>
 <li><tt>tor-volunteer</tt> &egrave; dedicato ai tuoi documenti, patch, test,
 esperienze con applicazioni di supporto e tutto ci&ograve; che pu&ograve;
 essere ispirato dalla nostra pagina <a href="<page volunteer>">Partecipa</a>

Modified: website/trunk/it/hidden-services.wml
===================================================================
--- website/trunk/it/hidden-services.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/it/hidden-services.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -116,15 +116,14 @@
 </p>
 
 <p>
-A questo punto &egrave; molto importante che l'hidden service continui ad
-usare lo stesso gruppo di <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#EntryGuards";>entry
-guard</a> per creare nuovi circuiti. Altrimenti un attaccante potrebbe
-gestire un proprio nodo e forzare un hidden service a creare un numero
-arbitrario di circuiti sperando che prima o poi il relay corrotto venga
-scelto come nodo di ingresso, venendo a conoscere cos&igrave; l'indirizzo IP
-dell'hidden service con una analisi sincronizzata. Questo attacco &egrave;
-stato descritto da &Oslash;verlier e Syverson nel loro saggio intitolato <a
+At this point it is of special importance that the hidden service sticks to
+the same set of <a
+href="<wiki>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>

Modified: website/trunk/it/index.wml
===================================================================
--- website/trunk/it/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/it/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -65,14 +65,13 @@
 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="<wiki>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
@@ -85,11 +84,10 @@
 <div class="underline"></div>
 
 <ul>
-<li>02 Maggio 2010: Tor 0.2.1.26 rilasciata come stabile. Risolve problemi di
-compatibilità ancora pià OpenSSL e consente di relà di difendersi dalle
-alluvioni di connessione. Leggi il <a
-href="https://blog.torproject.org/blog/tor-02120-released";>annuncio
-completo</a> l'elenco delle modifiche.</li>
+<li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
+compatibility issues and lets relays defend themselves from connection
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
+announcement</a> for the list of changes.</li>
 <li>29 Marzo 2010: Tor e Printfection annunciare Store Tor. Maggiori dettagli
 sono disponibili nel <a href="<page
 press/2010-03-25-tor-store-press-release>">comunicato stampa</a>.</li>

Deleted: website/trunk/it/tshirt.wml
===================================================================
--- website/trunk/it/tshirt.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/it/tshirt.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor: T-shirt" CHARSET="UTF-8"
-<div class="main-column">
-
-<h2>Tor: una T-shirt per chi contribuisce al progetto</h2>
-<hr />
-
-<p>Se contribuisci al progetto Tor puoi avere una di queste belle T-shirt
-Tor. Puoi aiutarci principalmente in tre modi:</p>
-
-<ol>
-<li>Facendo una <a href="<page donate>">donazione</a> abbastanza grossa (USD
-65+) a The Tor Project.</li>
-<li>Gestendo un <a href="<page docs/tor-doc-relay>">Tor relay</a> veloce che sia
-attivo da un paio di mesi almeno: puoi avere la maglietta se consenti
-l'uscita alla porta 80 e se ha in media 100 KB/s di traffico, o se non sei
-un exit node, ma hai un traffico medio di 500 KB/s.</li>
-<li>Aiutandoci in <a href="<page volunteer>">altri modi</a>. <a href="<page
-translation>">Mantieni una traduzione del sito web</a>. Scrivi un buon <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/SupportPrograms";>programma
-di supporto e fallo usare da molte persone</a>. Fai ricerca su Tor ed
-anonimato, chiudi dei <a href="https://bugs.torproject.org/";>bachi</a>, o
-diventa un promotore autorevole di Tor.
-</li>
-</ol>
-
-<p>
-Se pensi di avere i requisiti per una maglietta, manda una email a donations
-at torproject punto org con una breve spiegazione. Ricordati di indicare il
-colore preferito, la taglia (S/M/L/XL/XXL), una taglia di riserva se la
-prima non fosse disponibile, e l'indirizzo per la spedizione.
-</p>
-
-<p>
-Puoi scegliere tra il tradizionale color nero e il nostro intrigante verde
-brillante. Guarda le magliette <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorShirt";>in
-azione</a> &mdash; e aggiungi le tue foto.
-</p>
-
-<div style="text-align: center">
-<a href="tshirt/black-tor-tshirt.png"><img src="tshirt/black-tor-tshirt.png"
-/></a> <a href="tshirt/green-tor-tshirt.png"><img
-src="tshirt/green-tor-tshirt.png" /></a>
-</div>
-
-  </div>
-
-
-
-#include <foot.wmi>

Modified: website/trunk/lv/index.wml
===================================================================
--- website/trunk/lv/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/lv/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -63,15 +63,13 @@
 download>#Warning">jÄsaprot, ko Tor dara un nedara tavÄ labÄ</a>.</p>
 
 <p>
-Tor droÅÄba uzlabojas, pieaugot lietotÄju skaitam un pieaugot cilvÄku
-skaitam, kas <a href="<page docs/tor-doc-relay>">darbina
-retranslatorus</a>. (AktivizÄt retranslÄcijas funkciju nav tik sareÅÄÄti, kÄ
-tas varÄtu likties, un tas ievÄrojami <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#RelayAnonymity";>uzlabo
-tava paÅa droÅÄbu</a>). Ja retranslatora darbinÄÅana nav domÄta tev, mums ir
-nepiecieÅama <a href="<page volunteer>">palÄdzÄba citos projekta
-aspektos</a>, un mums nepiecieÅami lÄdzekÄi, lai turpinÄtu uzlabot Tor tÄkla
-ÄtrdarbÄbu un izmantoÅanas vieglumu, saglabÄjot labu droÅÄbu.</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="<wiki>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 ir reÄistrÄta 501(c)(3) ASV bezpeÄnas organizÄcija, kuras misija ir dot
 tev iespÄju pasargÄt savu Internet datplÅsmu no analÄzes. LÅdzu, atbalsti to
@@ -83,11 +81,10 @@
 <div class="underline"></div>
 
 <ul>
-<li>2. maijs, 2010: Izlaista stabila Tor 0.2.1.26 versija. Ir izlabotas OpenSSL
-savietojamÄbas problÄmas un pievienota aizsardzÄba retranslatoriem pasargÄt
-sevi no savienojumu plÅdiem. Lasiet  <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>pilnu
-paziÅojumu</a> ar izmaiÅu sarakstu.</li>
+<li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
+compatibility issues and lets relays defend themselves from connection
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
+announcement</a> for the list of changes.</li>
 <li>29. marts 2010: Tor un Printfection paziÅo par Tor veikala atvÄrÅanu. VairÄk
 informÄÄijas pieejams  <a href="<page
 press/2010-03-25-tor-store-press-release>">preses relÄzÄ</a>.</li>

Modified: website/trunk/nl/download.wml
===================================================================
--- website/trunk/nl/download.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/nl/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -245,13 +245,13 @@
 </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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>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="<wiki>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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/nl/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -64,15 +64,13 @@
 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://trac.torproject.org/projects/tor/wiki/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="<wiki>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
@@ -84,10 +82,10 @@
 <div class="underline"></div>
 
 <ul>
-<li>2 mei 2010: Tor 0.2.1.26 uitgebracht als stabiel. Verhelpt nog meer OpenSSL
-compabiliteitsproblemen en beschermt relays tegen overbelasting. Lees de <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>aankondiging</a>
-voor de lijst met veranderingen.</li>
+<li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
+compatibility issues and lets relays defend themselves from connection
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
+announcement</a> for the list of changes.</li>
 <li>29 maart 2010: Tor en Printfection kondigen de Tor Winkel aan. Meer details
 vindt u in <a href="<page press/2010-03-25-tor-store-press-release>">het
 persbericht</a>.</li>

Modified: website/trunk/no/bridges.wml
===================================================================
--- website/trunk/no/bridges.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/no/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -41,12 +41,12 @@
 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>.
+href="<wiki>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>
@@ -152,8 +152,8 @@
 en brorelÃ. Du kan konfigurere det slikt:
 <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 />
+href="<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit your torrc
+file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -168,8 +168,8 @@
 
 <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>.
+href="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/no/documentation.wml
===================================================================
--- website/trunk/no/documentation.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/no/documentation.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -40,37 +40,35 @@
 </li>
 
 <li>
-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.
+Our <a href="<wiki>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>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
+href="<wiki>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>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.
+href="<wiki>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>
-<a href="https://blog.torproject.org/";>Tor har en blogg nÃ</a>. Vi prÃver Ã
-holde den oppdatert noen ganger i uken med det av nyheter som mÃtte vÃre.
+<a href="<blog>">Tor has a blog now</a>.  We try to keep it updated every
+week or two with the latest news.
 </li>
 
 <li>
@@ -223,8 +221,8 @@
 utvidelser</a></li>
 <li><a href="<gitblob>doc/spec/version-spec.txt">Hvordan Tor numererer
 versjonene</a></li>
-<li><a href="<gitblob>doc/spec/proposals">Utkast av nye spesifikasjoner og
-forslag til endringer som fortsatt er aktiv</a></li>
+<li><a href="<gittree>doc/spec/proposals">In-progress drafts of new
+specifications and proposed changes</a></li>
 </ul></li>
 
 </ul>
@@ -232,12 +230,10 @@
 <a id="NeatLinks"></a>
 <h2><a class="anchor" href="#NeatLinks">Fine lenker</a></h2>
 <ul>
-<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://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>The <a href="<wiki>">Tor wiki</a> provides a plethora of helpful
+contributions from Tor users. Check it out!</li>
+<li><a href="<wiki>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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/no/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -248,12 +248,11 @@
 <li>
 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.
+<a href="<wiki>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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/no/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -13,7 +13,7 @@
 
 
 <!-- PUT CONTENT AFTER THIS TAG -->
-<h2>Tor: Anonymitet online</h2>
+<h2>Tor: Anonymitet pà nettet</h2>
 
 
 <!-- BEGIN SIDEBAR -->
@@ -66,11 +66,10 @@
 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>
+href="<wiki>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
@@ -84,8 +83,7 @@
 <ul>
 <li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
 compatibility issues and lets relays defend themselves from connection
-floods.  Read the <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>full
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
 announcement</a> for the list of changes.</li>
 <li>29 March 2010: Tor and Printfection announce The Tor Store.  More details
 are available in the <a href="<page

Modified: website/trunk/pl/bridges.wml
===================================================================
--- website/trunk/pl/bridges.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -36,16 +36,16 @@
 </p>
 
 <p>
-Jest teÅ moÅliwe, Åe Tor nie dziaÅa z innych powodÃw. Najnowsza wersja <a
-href="<page torbrowser/index>">Paczki Tora z przeglÄdarkÄ</a> pod Windows
-prÃbuje podaÄ Ci lepsze wskazÃwki czemu Tor moÅe mieÄ problem z
-poÅÄczeniem. Przeczytaj teÅ <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork";>najczÄÅciej
-zadawane pytania o problemach z prawidÅowym dziaÅaniem Tora</a>, jeÅli masz
-problemy. JeÅli Twoim zdaniem problem polega na blokowaniu lub po prostu
-chcesz sprÃbowaÄ, bo czujesz siÄ niepewnie lub jesteÅ ÅÄdny przygÃd, czytaj
-dalej. Upewnij siÄ, Åe masz <a href="<page download>">najnowszÄ wersjÄ
-0.2.1.x lub 0.2.2.x na swÃj system</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="<wiki>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>
@@ -150,9 +150,9 @@
 powinieneÅ/aÅ prowadziÄ przekaÅnik mostkowy. MoÅesz skonfigurowaÄ go na dwa
 sposoby:
 <ul>
-<li> rÄcznie <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>edytujÄc
-swÃj plik torrc</a>, by skÅadaÅ siÄ tylko z tych czterech linii:
+<li> manually <a
+href="<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit your torrc
+file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -165,10 +165,10 @@
 </ul>
 </p>
 
-<p>JeÅli dostajesz bÅÄdy "Could not bind to 0.0.0.0:443: Permission denied" w
-czasie startu, musisz wybraÄ wyÅszy ORPort (np. 8080) lub wykonaÄ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>trochÄ
-skomplikowanego przekierowywania portÃw</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="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/pl/contact.wml
===================================================================
--- website/trunk/pl/contact.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/contact.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -40,11 +40,10 @@
 <li><tt>tor-ops</tt> dociera do ludzi, ktÃrzy zarzÄdzajÄ serwerami
 katalogowymi. Pisz pod ten adres, jeÅli prowadzisz przekaÅnik sieci i masz
 pytania lub problem ze swoim przekaÅnikiem.</li>
-<li><tt>tor-webmaster</tt> zajmuje siÄ poprawianiem bÅÄdÃw na stronie, zmianÄ
-bÅÄdnych sformuÅowaÅ lub wskazÃwek oraz dodawaniem nowych sekcji i
-paragrafÃw, ktÃre moÅesz nam wysÅaÄ. Jednak lepiej bÄdzie, jeÅli wczeÅniej
-zrobisz szkic nowych sekcji w <a
-href="https://trac.torproject.org/projects/tor/wiki";>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="<wiki>">the Tor wiki</a> first.</li>
 <li><tt>tor-volunteer</tt> chce sÅyszeÄ o Twoich dokumentach, poprawkach,
 testach oraz doÅwiadczeniach z aplikacjami wspÃÅdziaÅajÄcym z Torem, takÅe
 informacje zainspirowane <a href="<page volunteer>">stronÄ dla

Modified: website/trunk/pl/documentation.wml
===================================================================
--- website/trunk/pl/documentation.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/documentation.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -40,40 +40,35 @@
 </li>
 
 <li>
-Nasz dokument <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>FAQ</a>
-zawiera wszelkie rodzaje tematÃw, ÅÄcznie z pytaniami o uruchamianiu klienta
-lub przekaÅnika sieci, atakami na anonimowoÅÄ, czemu nie stworzyliÅmy Tora w
-inny sposÃb oraz dyskusjÄ na temat uÅytkownikÃw Tora i naduÅywania Tora.
-Jest osobne <a href="<page faq-abuse>">FAQ o naduÅyciach</a> jest zbiorem
-czÄstych pytaÅ i omawianych spraw, gdy ktoÅ posiada przekaÅnik sieci Tora.
-<a href="<page eff/tor-legal-faq>">Prawne FAQ Tora</a> zostaÅo napisane
-przez prawnikÃw EFF. Jego celem jest daÄ wszystkim poglÄd na pewne sprawy
-prawne, ktÃre sÄ zwiÄzane z projektem Tora w USA.
+Our <a href="<wiki>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>">PodrÄcznik</a> zawiera wszystkie moÅliwe wpisy,
-ktÃre moÅna umieÅciÄ w swoim <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>pliku
-torrc</a>. Mamy teÅ <a href="<page tor-manual-dev>">podrÄcznik do wersji
-rozwojowej Tora</a>.</li>
+<li>The <a href="<page tor-manual>">manual</a> lists all the possible entries
+you can put in your <a
+href="<wiki>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>Jsli masz pytania, mamy kanaÅ IRC Tora (dla uÅytkownikÃw, operatorÃw
-przekaÅnikÃw sieci i deweloperÃw): <a href="irc://irc.oftc.net/tor">#tor na
-irc.oftc.net</a>.  JeÅli znalazÅeÅ bÅÄd, zwÅaszcza prowadzÄcy do zamkniÄcia
-programu, najpierw przeczytaj <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#MyTorkeepscrashing.";>jak
-zgÅaszaÄ bÅÄdy Tora</a>, a potem podaj nam jak najwiÄcej informacji o tym
-bÅÄdzie w systemie <a href="https://bugs.torproject.org/tor";>bugtracker</a>
-(system Åledzenia bÅÄdÃw).  (JeÅli twÃj bÅÄd jest w Polipo, przeglÄdarce,
-lub jakiejkolwiek innej aplikacji, proszÄ nie umieszczaÄ go w naszym
-systemie.)  <a href="#MailingLists">Lista mailingowa or-talk</a> teÅ moÅe
-siÄ przydaÄ.
+<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="<wiki>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>
-<a href="https://blog.torproject.org/";>Tor ma juÅ bloga</a>.  PrÃbujemy go
-uaktualniaÄ najnowszymi wiadomoÅciami raz na tydzieÅ czy dwa.
+<a href="<blog>">Tor has a blog now</a>.  We try to keep it updated every
+week or two with the latest news.
 </li>
 
 <li>
@@ -228,8 +223,8 @@
 rozszerzenia</a></li>
 <li><a href="<gitblob>doc/spec/version-spec.txt">Jak dziaÅajÄ numery wersji
 Tora</a></li>
-<li><a href="<gitblob>doc/spec/proposals/">Szkice nowych specyfikacji i
-proponowanych zmian</a></li>
+<li><a href="<gittree>doc/spec/proposals">In-progress drafts of new
+specifications and proposed changes</a></li>
 </ul></li>
 
 </ul>
@@ -237,11 +232,10 @@
 <a id="NeatLinks"></a>
 <h2><a class="anchor" href="#NeatLinks">Ciekawe Linki</a></h2>
 <ul>
-<li><a href="https://trac.torproject.org/projects/tor/wiki";>Tor wiki</a> ma
-mnÃstwo pomocnych wpisÃw od uÅytkownikÃw Tora. SprawdÅ!</li>
-<li><a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>Lista
-pomocnych programÃw, ktÃrych moÅna uÅyÄ z Torem</a>.</li>
+<li>The <a href="<wiki>">Tor wiki</a> provides a plethora of helpful
+contributions from Tor users. Check it out!</li>
+<li><a href="<wiki>SupportPrograms">A list of supporting programs you might want
+to use in association with Tor</a>.</li>
 <li><a href="https://check.torproject.org/";>Wykrywacz Tora</a> lub <a
 href="http://torcheck.xenobite.eu/";>inny wykrywacz Tora</a> prÃbujÄ zgadnÄÄ,
 czy uÅywasz Tora, czy nie.</li>

Modified: website/trunk/pl/download-unix.wml
===================================================================
--- website/trunk/pl/download-unix.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/download-unix.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -71,8 +71,7 @@
 <td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>
 <td>
 <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br /> <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/OpenbsdChrootedTor";>Przewodnik
-do chrootowania Tora w OpenBSD</a>
+href="<wiki>OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>
 </td>
 </tr>
 
@@ -231,14 +230,12 @@
 </li>
 
 <li>
-Tor anonimizuje ÅrÃdÅo przesyÅanych informacji i szyfruje wszystko wewnÄtrz
-sieci Tora, ale <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#ExitEavesdroppers";>nie
-moÅe szyfrowaÄ danych miÄdzy sieciÄ Tora a punktem docelowym.</a> JeÅli
-wysyÅasz prywatne informacje, powinieneÅ/aÅ wkÅadaÄ w ich ochronÄ tyle
-wysiÅku, ile normalnie byÅ wkÅadaÅ/a w normalnym, przeraÅajÄcym internecie
-&mdash; uÅywaj HTTPS lub innego protokoÅu uwierzytelniania i szyfrowania
-nadawca-odbiorca.
+Tor anonymizes the origin of your traffic, and it encrypts everything inside
+the Tor network, but <a href="<wiki>TorFAQ#ExitEavesdroppers">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/download.wml
===================================================================
--- website/trunk/pl/download.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -251,14 +251,13 @@
 </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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>nie
-moÅe szyfrowaÄ danych miÄdzy sieciÄ Tora a punktem docelowym.</a> JeÅli
-wysyÅasz prywatne informacje, powinieneÅ/aÅ wkÅadaÄ w ich ochronÄ tyle
-wysiÅku, ile normalnie byÅ wkÅadaÅ/a 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="<wiki>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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/faq-abuse.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -252,12 +252,11 @@
 wypowiedzi. MoÅe zaproszenie ich na kanaÅ #tor na irc.oftc.net pomoÅe im
 pokazaÄ, Åe nie wszyscy jesteÅmy zÅymi ludÅmi. </p>
 
-<p>Ostatecznie, jeÅli odkryjesz sieÄ IRC, ktÃra zdaje siÄ blokowaÄ Tora lub
-jeden z jego punktÃw wyjÅcia, podaj tÄ informacjÄ na <a
-href="https://wiki.torproject.org/wiki/TheOnionRouter/BlockingIrc";>stronie
-Åledzenia blokad Tora przez IRC</a>, Åeby podzieliÄ siÄ tym z innymi. Co
-najmniej jedna sieÄ IRC sprawdza tÄ stronÄ, Åeby odblokowywaÄ punkty
-wyjÅcia, ktÃre zostaÅy niesÅusznie zablokowane. </p>
+<p>Finally, if you become aware of an IRC network that seems to be blocking
+Tor, or a single Tor exit node, please put that information on <a
+href="<wiki>BlockingIrc">The Tor IRC block tracker</a> so that others can
+share.  At least one IRC network consults that page to unblock exit nodes
+that have been blocked inadvertently. </p>
 
 <a id="SMTPBans"></a>
 <h3><a class="anchor" href="#SMTPBans">Wasze wÄzÅy sÄ zablokowane na serwerze

Modified: website/trunk/pl/faq.wml
===================================================================
--- website/trunk/pl/faq.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/faq.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -84,10 +84,8 @@
 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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>wiki
-FAQ</a>.</p>
+<p>For other questions not yet on this version of the FAQ, see the <a
+href="<wiki>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>
@@ -195,16 +193,13 @@
 </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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO";>toryfikacji
-poszczegÃlnych aplikacji</a>. Jest teÅ <a
-href="hhttps://trac.torproject.org/projects/tor/wiki/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="<wiki>TorifyHOWTO">Torifying specific applications</a>. There's
+also a <a href="<wiki>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>
@@ -389,10 +384,9 @@
 </p>
 
 <p>
-JeÅli chcesz bardziej wyczerpujÄcÄ odpowiedÅ, przeczytaj <a
-href="https://blog.torproject.org/blog/why-tor-is-slow";>wiadomoÅÄ na blogu
-Rogera o tym temacie</a>, ktÃra zawiera zarÃwno szczegÃÅowy PDF, jak i
-towarzyszÄce wideo.
+For the much more in-depth answer, see <a
+href="<blog>why-tor-is-slow">Roger's blog post on the topic</a>, which
+includes both a detailed PDF and a video to go with it.
 </p>
 
 <p>
@@ -422,13 +416,13 @@
 </li>
 
 <li>
-Jest kilka krokÃw, ktÃre kaÅdy moÅe podjÄÄ, by polepszyÄ wydajnoÅÄ Tora. <a
-href="https://trac.torproject.org/projects/tor/wiki/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Äc nam o tym znaÄ.
+There are some steps that individuals can take to improve their Tor
+performance. <a href="<wiki>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>
@@ -766,17 +760,17 @@
 procesÃw lub zadaÅ i zakoÅcz proces Tor. Potem uÅyj Vidalii do ponownego
 uruchomienia Tora i wszystko znÃw bÄdzie dziaÅaÄ.
 </li>
-<li>Skonfigurowano Tora tak, by dziaÅaÅ jako usÅuga Windows NT. Gdy Tor jest tak
-skonfigurowany, uruchamia siÄ wraz z systemem. JeÅli skonfigurowano Tora do
-uruchamiania siÄ jako usÅuga z Vidalii, utworzone i zapisane zostaÅo losowe
-hasÅo dla Tora. Po uruchomieniu systemu Tor startuje i uÅywa zapisanego
-losowego hasÅa. Logujesz siÄ i uruchamiasz VidaliÄ. Vidalia prÃbuje
-porozumieÄ siÄ z juÅ uruchomionym Torem. Vidalia generuje losowe hasÅo, ale
-jest ono inne niÅ hasÅo zapisane w usÅudze Tora. Musisz przekonfigurowaÄ
-Tora, by nie dziaÅaÅ jako usÅuga. Przeczytaj wpis w FAQ o <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#HowdoIrunmyTorrelayasanNTservice";>uruchamianiu
-Tora jako usÅugi Windows NT</a> po wiÄcej informacji o tym, jak usunÄÄ
-usÅugÄ Tora.
+<li>You had previously set Tor to run as a Windows NT service. When Tor is set
+to run as a service, it starts up when the system boots. If you configured
+Tor to start as a service through Vidalia, a random password was set and
+saved in Tor. When you reboot, Tor starts up and uses the random password it
+saved. You login and start up Vidalia. Vidalia attempts to talk to the
+already running Tor. Vidalia generates a random password, but it is
+different than the saved password in the Tor service.  <br /> You need to
+reconfigure Tor to not be a service. See the FAQ entry on <a
+href="<wiki>TorFAQ#HowdoIrunmyTorrelayasanNTservice">running Tor as a
+Windows NT service</a> for more information on how to remove the Tor
+service.
 </li>
 </ol>
 
@@ -815,15 +809,13 @@
 nie rozumiemy.
 </p>
 <p>
-Opcje <tt>EntryNodes</tt> i <tt>ExitNodes</tt> sÄ traktowane jako proÅba, co
-znaczy, Åe jeÅli te wÄzÅy sÄ wyÅÄczone lub wydajÄ siÄ dziaÅaÄ wolno, Tor
-dalej bÄdzie ich unikaÅ. MoÅesz sprawiÄ, Åe te opcje bÄdÄ obowiÄzkowe
-ustawiajÄc <tt>StrictExitNodes 1</tt> lub <tt>StrictEntryNodes 1</tt>
-&mdash; ale jeÅli tak zrobisz, Twoje poÅÄczenia przez Tora przestanÄ
-dziaÅaÄ, jeÅli wszystkie podane przez Ciebie wÄzÅy stanÄ siÄ
-nieosiÄgalne. Zobacz <a
-href="https://www.torproject.org/documentation.html.en#NeatLinks";>strony
-statusu Tora</a>, by znaleÅÄ wÄzÅy, ktÃre moÅna wybraÄ.
+The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as
+a request, meaning if the nodes are down or seem slow, Tor will still avoid
+them.  You can make the option mandatory by setting <tt>StrictExitNodes
+1</tt> or <tt>StrictEntryNodes 1</tt> &mdash; but if you do, your Tor
+connections will stop working if all of the nodes you have specified become
+unreachable.  See the <a href="<page documentation>#NeatLinks">Tor status
+pages</a> for some nodes you might pick.
 </p>
 <p>
 Zamiast <tt>$fingerprint</tt> moÅesz podaÄ teÅ 2-literowy kod kraju wedÅug
@@ -848,13 +840,10 @@
 </p>
 
 <ul>
-<li>Tor ma wbudowanÄ obsÅugÄ <a
-href="https://trac.torproject.org/projects/tor/wiki/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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Hibernation";>moÅliwoÅÄ
-hibernacji</a>.
+<li>Tor has built-in support for <a href="<wiki>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="<wiki>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
@@ -870,11 +859,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://trac.torproject.org/projects/tor/wiki/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="<wiki>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Å
@@ -892,35 +881,30 @@
 </p>
 
 <p>
-KaÅdy przekaÅnik Tora ma politykÄ wyjÅcia, ktÃra okreÅla, jakie rodzaje
-poÅÄczeÅ wychodzÄcych sÄ dozwolone lub zabronione z danego
-przekaÅnika. Polityki wyjÅcia sÄ rozprowadzane do klientÃw Tora poprzez
-katalog, wiÄc klienci automatycznie uniknÄ wybierania przekaÅnikÃw, ktÃre
-odmÃwiÅyby wyjÅcia do ich zamierzonych miejsc. W ten sposÃb kaÅdy przekaÅnik
-moÅe decydowaÄ o usÅugach, hostach i sieciach, do ktÃrych chce zezwalaÄ na
-poÅÄczenia, w oparciu o moÅliwoÅci naduÅyÄ i wÅasnÄ sytuacjÄ. Przeczytaj
-wpis do FAQ o <a href="<page faq-abuse>#TypicalAbuses">sprawach, ktÃre moÅna
-napotkaÄ w razie uÅywania domyÅlnej polityki wyjÅcia</a>, po czym przeczytaj
-<a
-href="https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment";>wskazÃwki
-prowadzenia wÄzÅa wyjÅciowego z minimalnym naraÅeniem</a> Mike'a Perry'ego.
+Each Tor relay has an exit policy that specifies what sort of outbound
+connections are allowed or refused from that relay. The exit policies are
+propagated to Tor clients via the directory, so clients will automatically
+avoid picking exit relays that would refuse to exit to their intended
+destination. This way each relay can decide the services, hosts, and
+networks he wants to allow connections to, based on abuse potential and his
+own situation. Read the FAQ entry on <a href="<page
+faq-abuse>#TypicalAbuses">issues you might encounter</a> if you use the
+default exit policy, and then read Mike Perry's <a
+href="<blog>tips-running-exit-node-minimal-harassment">tips for running an
+exit node with minimal harassment</a>.
 </p>
 
 <p>
-DomyÅlna polityka wyjÅcia pozwala na dostÄp do wielu popularnych usÅug
-(np. przeglÄdania sieci), ale <a
-href="https://trac.torproject.org/projects/tor/wiki/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://trac.torproject.org/projects/tor/wiki/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="<wiki>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="<wiki>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>
@@ -989,11 +973,9 @@
 OpenSSL 1.0.0-beta5, proces kompilacji Tora automatycznie rozpozna i
 skorzysta z tej cechy.</li>
 
-<li>JeÅli jesteÅ na systemie Solaris, OpenBSD, NetBSD, lub starym FreeBSD, Tor
-prawdopodobnie uruchamia osobne procesy zamiast uÅywaÄ wÄtkÃw. RozwaÅ zmianÄ
-na <a
-href="https://trac.torproject.org/projects/tor/wiki/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="<wiki>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
@@ -1097,17 +1079,15 @@
 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="hhttps://trac.torproject.org/projects/tor/wiki/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="<wiki>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>
@@ -1134,14 +1114,13 @@
 </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://trac.torproject.org/projects/tor/wiki/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="<wiki>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>
@@ -1171,10 +1150,10 @@
 </p>
 
 <p>
-Po piÄte, moÅemy potrzebowaÄ jakiegoÅ schematu bodÅcÃw do zachÄcana ludzi,
-by przekierowywali ruch innych lub zostali wÄzÅami wyjÅciowymi. Tu sÄ nasze
-<a href="https://blog.torproject.org/blog/two-incentive-designs-tor";>bieÅÄce
-pomysÅy na bodÅce Tora</a>.
+Fifth, we might need some sort of incentive scheme to encourage people to
+relay traffic for others, and/or to become exit nodes. Here are our <a
+href="<blog>two-incentive-designs-tor">current thoughts on Tor
+incentives</a>.
 </p>
 
 <p>
@@ -1195,9 +1174,8 @@
 Internetu o moim przekaÅniku wyjÅciowym?</a></h3>
 
 <p>
-Zestaw szablonÃw dobrych odpowiedzi dostawcom internetu zostaÅ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorAbuseTemplates";>zebrany
-tutaj</a>.
+A collection of templates for successfully responding to ISPs is <a
+href="<wiki>TorAbuseTemplates">collected here</a>.
 </p>
 
 <hr />

Modified: website/trunk/pl/hidden-services.wml
===================================================================
--- website/trunk/pl/hidden-services.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/hidden-services.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -113,17 +113,16 @@
 </p>
 
 <p>
-W tym momencie waÅny jest fakt, Åe usÅuga ukryta trzyma siÄ ciÄgle tych
-samych <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Whatsthisaboutentryguardformerlyknownashelpernodes";
->wejÅciowych wÄzÅÃw-straÅnikÃw</a> w czasie tworzenia nowych obwodÃw. W
-innym przypadku napastnik mÃgÅby prowadziÄ wÅasny przekaÅnik sieci i zmusiÄ
-usÅugÄ ukrytÄ do tworzenia dowolnej liczby obwodÃw z nadziejÄ, Åe jego
-przekaÅnik zostaÅby wybrany na punkt wejÅcia i poznaÅby adres IP usÅugi
-ukrytej poprzez analizÄ czasÃw.  Ten atak zostaÅ opisany przez
-&Oslash;verlier'a i Syversona w ich dokumencie pod tytuÅem <a
-href="http://freehaven.net/anonbib/#hs-attack06"; >Znajdowanie Ukrytych
-SerwerÃw (Locating Hidden Servers)</a>.
+At this point it is of special importance that the hidden service sticks to
+the same set of <a
+href="<wiki>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/pl/index.wml
===================================================================
--- website/trunk/pl/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -65,16 +65,13 @@
 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://trac.torproject.org/projects/tor/wiki/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="<wiki>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
@@ -87,11 +84,10 @@
 <div class="underline"></div>
 
 <ul>
-<li>2 Maja 2010: Tor 0.2.1.26 wydany jako wersja stabilna. Naprawia dalsze
-problemy z OpenSSL i pozwala przekaÅnikom broniÄ siÄ przed powodziami
-poÅÄczeÅ. Przeczytaj <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>peÅne
-ogÅoszenie</a> by poznaÄ listÄ poprawek.</li>
+<li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
+compatibility issues and lets relays defend themselves from connection
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
+announcement</a> for the list of changes.</li>
 <li>29 Marca 2010: Tor i Printfection ogÅazajÄ sklep Tora. WiÄcej w <a
 href="<page press/2009-03-12-performance-roadmap-press-release>">ogÅoszeniu
 prasowym</a>.</li>

Deleted: website/trunk/pl/news.wml
===================================================================
--- website/trunk/pl/news.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/news.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -1,182 +0,0 @@
-
-
-
-
-
-
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor: News" CHARSET="UTF-8"
-<div class="main-column">
-
-
-
-<!-- PUT CONTENT AFTER THIS TAG -->
-<a id="News"></a>
-<h2><a class="anchor" href="#News">Tor: NowoÅci</a></h2>
-<div class="underline"></div>
-
-<ul>
-<li>2 Maja 2010: Tor 0.2.1.26 wydany jako wersja stabilna. Naprawia dalsze
-problemy z OpenSSL i pozwala przekaÅnikom broniÄ siÄ przed powodziami
-poÅÄczeÅ. Przeczytaj <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>peÅne
-ogÅoszenie</a> by poznaÄ listÄ poprawek.</li>
-<li>29 Marca 2010: Tor i Printfection ogÅazajÄ sklep Tora. WiÄcej w <a
-href="<page press/2009-03-12-performance-roadmap-press-release>">ogÅoszeniu
-prasowym</a>.</li>
-<li>16 Marca 2010: Tor 0.2.1.25 wydany jako wersja stabilna. Naprawia problem z
-wersji 0.2.1.23, ktÃry mÃgÅ uniemoÅliwiÄ przekaÅnikom zgadniÄcie ich adresu
-IP. Poprawia teÅ kilka pomniejszych potencjalnych problemÃw z
-bezpieczeÅstwem. Przeczytaj <a
-href="http://archives.seul.org/or/announce/Mar-2010/msg00000.html";>ogÅoszenie</a>
-by poznaÄ peÅnÄ listÄ zmian.</li>
-<li>21 Lutego 2010: Tor 0.2.1.24 wydany jako wersja stabilna. Naprawia zgodnoÅÄ
-z ostatnimi zmianami w OpenSSL w Apple OSX i dodaje trochÄ poprawek
-wydajnoÅci. Przeczytaj <a
-href="http://archives.seul.org/or/announce/Feb-2010/msg00000.html";>ogÅoszenie</a>
-by poznaÄ peÅnÄ listÄ zmian.</li>
-<li>19 Stycznia 2010: Tor 0.2.1.22 wydany jako wersja stabilna. Naprawia
-krytyczny problem z prywatnoÅciÄ w serwerach katalogowych mostkÃw. Ta
-aktualizacja zmienia takÅe dwa z siedmiu kluczy i lokalizacji serwerÃw
-katalogowych v3. Przeczytaj <a
-href="http://archives.seul.org/or/announce/Jan-2010/msg00000.html";>ogÅoszenie</a>
-by poznaÄ peÅnÄ listÄ poprawek.</li>
-<li>21 Grudnia 2009: Tor 0.2.1.21 wydany jako wersja stabilna. Naprawia problemy
-z OpenSSL i pomaga przekaÅnikom wyjÅciowym. Przeczytaj <a
-href="http://archives.seul.org/or/announce/Dec-2009/msg00000.html";>ogÅoszenie</a>
-by poznaÄ peÅnÄ listÄ poprawek. </li>
-<li>10 PaÅdziernika 2009: Tor 0.2.1.20 wydany jako wersja stabilna. Przeczytaj
-<a
-href="https://blog.torproject.org/blog/tor-02120-released";>ogÅoszenie</a>,
-by dowiedzieÄ siÄ o zmianach i aktualizacjach.</li>
-<li>28 Lipca 2009: Tor 0.2.1.19 wydany jako wersja stabilna. Przeczytaj <a
-href="http://archives.seul.org/or/announce/Aug-2009/msg00000.html";>ogÅoszenie</a>
-by dowiedzieÄ siÄ o zmianach i aktualizacjach.</li>
-<li>25 Czerwca 2009: Tor 0.2.0.35 wydany jako wersja stabilna.  Przeczytaj <a
-href="http://archives.seul.org/or/announce/Jun-2009/msg00000.html";>ogÅoszenie</a>
-by dowiedzieÄ siÄ o zmianach i aktualizacjach.</li>
-<li>12 Marca 2009: Tor wydaje kampaniÄ i plan rozwoju wydajnoÅci. Przeczytaj <a
-href="<page press/2009-03-12-performance-roadmap-press-release>">ogÅoszenie
-prasowe</a>, by poznaÄ szczegÃÅy.</li>
-<li>09 Lutego 2009: Tor 0.2.0.34 wydany jako wersja stabilna.  Przeczytaj <a
-href="http://archives.seul.org/or/announce/Feb-2009/msg00000.html";>ogÅoszenie</a>
-by dowiedieÄ siÄ o zmianach i aktualizacjach. To wydanie naprawia problem
-bezpieczeÅstwa.</li>
-<li>21 Stycznia 2009: Tor 0.2.0.33 wydany jako wersja stabilna.  Przeczytaj <a
-href="http://archives.seul.org/or/announce/Jan-2009/msg00000.html";>ogÅoszenie</a>,
-by dowiedieÄ siÄ o zmianach i aktualizacjach.</li>
-<li>19 Grudnia 2008: Tor wydaje 3-letni plan rozwojowy. Przeczytajcie <a
-href="<page press/2008-12-19-roadmap-press-release>">oÅwiadczenie dla
-prasy</a>, by dowiedzieÄ siÄ wiÄcej.</li>
-<li>05 Grudnia 2008: Tor 0.2.0.32 wydany jako wersja stabilna. Przeczytaj <a
-href="http://archives.seul.org/or/announce/Dec-2008/msg00000.html";>ogÅoszenie</a>,
-by dowiedieÄ siÄ o zmianach i aktualizacjach.</li>
-<li>08 WrzeÅnia 2008: Tor 0.2.0.31 wydany jako wersja stabilna. Przeczytaj <a
-href="http://archives.seul.org/or/announce/Sep-2008/msg00000.html";>ogÅoszenie</a>,
-by dowiedieÄ siÄ o zmianach i aktualizacjach.</li>
-<li>25 Sierpnia 2008: Tor 0.2.0.30 wydany jako wersja stabilna. Przecytajcie <a
-href="http://archives.seul.org/or/announce/Aug-2008/msg00000.html";>ogÅoszenie</a>
-lub <a
-href="https://blog.torproject.org/blog/tor-0.2.0.30-released-stable";>post na
-blogu</a>, by poznaÄ liczne aktualizacje i zmiany.</li>
-<li>25 Maja 2008: Tor otrzymaÅ dwie nagrody (granty) od <a
-href="http://nlnet.nl/";>Fundacji NLnet</a>. Pierwsza ma sÅuÅyÄ polepszeniu
-wydajnoÅci usÅug ukrytych. Druga ma na celu polepszenie dziaÅania Tora w
-stosunku do klientÃw o niskiej przepustowoÅci ÅÄcza.  <a
-href="http://nlnet.nl/news/2008/20080514-awards.html";>Strona z nagrodami</a>
-NLnet zawiera wiÄcej szczegÃÅÃw o tych dwÃch projektach.</li>
-
-<li>13 Maja 2008: <a
-href="http://archives.seul.org/or/talk/May-2008/msg00048.html";>Tor
-0.2.0.26-rc</a> wymienia wiele kluczy centrÃw katalogowych wersji 3, na
-ktÃre mÃgÅ mieÄ wpÅyw niedawny <a
-href='http://lists.debian.org/debian-security-announce/2008/msg00152.html'>bÅÄd
-w OpenSSL na Debianie</a>.  <strong>To wydanie jest krytyczne pod wzglÄdem
-bezpieczeÅstwa.</strong> Wszyscy, ktÃrzy majÄ jakÄkolwiek wersjÄ z gaÅÄzi
-0.2.0.x, powinni zaktualizowaÄ swojego Tora, bez rÃÅnicy czy uÅywajÄ
-Debiana, czy nie. Ponadto, wszystkie serwery z jakÄkolwiek wersjÄ Tora,
-ktÃrego klucze zostaÅy wygenerowane przez Debiana, Ubuntu lub jakÄÅ
-dystrybucjÄ pochodnÄ, powinny zmieniÄ swoje klucze toÅsamoÅci. Przeczytaj
-nasz <a
-href='http://archives.seul.org/or/announce/May-2008/msg00000.html'>biuletyn
-bezpieczeÅstwa</a> lub <a
-href="https://blog.torproject.org/blog/debian-openssl-flaw%3A-what-does-it-mean-tor-clients%3F";>wpis
-na blogu</a>, by poznaÄ wszystkie szczegÃÅy sprawy. Jak zawsze, znajdziecie
-Tora 0.2.0.26-rc na <a href="https://www.torproject.org/download";>stronie
-pobierania</a>.</li>
-<li>Marzec 2008: <a
-href="https://blog.torproject.org/blog/tor-project-google-summer-code-2008!";>Projekt
-Tor znalazÅ siÄ w Google Summer of Code 2008!</a></li>
-
-<li>Luty 2008: <a href="https://www.torproject.org/people#Board";>Rada
-DyrektorÃw</a> wita <a
-href="https://blog.torproject.org/blog/isaac-mao-elected-one-our-new-directors";>Isaaca
-Mao</a>. DziÄkujemy Rebece McKinnon za jej wsparcie i wkÅad w projekt.</li>
-
-<li>Luty 2008: Tor z radoÅciÄ ogÅasza otwarcie <a
-href="https://blog.torproject.org";>oficjalnego blogu Tora</a>.</li>
-
-<li>StyczeÅ 2008: <a href="<page download>">Tor 0.1.2.19</a> (najnowsza wersja
-stabilna) naprawia olbrzymi wyciek pamiÄci na wÄzÅach wyjÅciowych, zmienia
-domyÅlnÄ politykÄ wyjÅcia na bardziej konserwatywnÄ, by bezpieczniej byÅo
-mieÄ wÅasny wÄzeÅ wyjÅciowy w domu, i poprawia wiele mniejszych spraw.
-Prosimy aktualizowaÄ. DostÄpne sÄ peÅne <a
-href="http://archives.seul.org/or/announce/Jan-2008/msg00000.html";>informacje
-o wydaniu</a>.</li>
-
-<li>PaÅdziernik 2007: <a href="<page download>">Tor 0.1.2.18</a> (nowa wersja
-stabilna) naprawia wiele problemÃw, w tym pady programu, problemy z
-wprowadzaniem usÅug ukrytych powodujÄce duÅe opÃÅnienia i wielki bÅÄd, ktÃry
-powodowaÅ znikanie niektÃrych serwerÃw z list statusowych na kilka godzin
-kaÅdego dnia.  ZmieniliÅmy teÅ domyÅlne pliki konfiguracyjne Privoxy w
-paczkach, by uniknÄÄ pewnych problemÃw z bezpieczeÅstwem, wiÄc zostaw
-"install Privoxy" wÅÄczone podczas aktualizacji. Przeczytaj <a
-href="http://archives.seul.org/or/announce/Oct-2007/msg00000.html";>informacje
-o wydaniu</a>, by poznaÄ szczegÃÅy.</li>
-
-<li>PaÅdziernik 2007: jak wielu z was wie, Projekt Tor staÅ siÄ <a href="<page
-people>">niezaleÅnÄ organizacjÄ oficjalnie non-profit</a> w lutym.
-ZrobiliÅmy to, by mÃc przyjmowaÄ granty od grup, ktÃre dotujÄ tylko NGO
-(organizacje pozarzÄdowe), oraz aby nasi darczyÅcy mogli odpisywaÄ sobie od
-podatku kwalifikujÄce siÄ <a href="<page donate>">dotacje</a> skÅadane nam.
-<br /> ChcielibyÅmy rozszerzyÄ nasze gÅÄbokie podziÄkowania fundacji <a
-href="https://www.eff.org/";>Electronic Frontier Foundation</a> za ich dawne
-wsparcie, sponsorowanie podatkowe, pomoc w hostowaniu czÄÅci naszych stron
-internetowych i nieustajÄcy nadzÃr i doradztwo do naszej mÅodej organizacji
-non-profit.</li>
-
-<li>WrzesieÅ 2007: JeÅli otrzymaÅeÅ/aÅ email, ktÃry twierdziÅ, Åe pochodzi od
-Tora, nie byÅo n od nas. <a href="<page download>">Oficjalne paczki Tora</a>
-moÅna <a href="<page verifying-signatures>">zweryfikowaÄ pod kÄtem
-autentycznoÅci</a>.</li>
-
-<li>SierpieÅ 2007: <strong>Prosimy zaktualizowaÄ Tora!</strong> Najnowsze wersje
-(stabilna: 0.1.2.17; rozwojowa: 0.2.0.6-alpha) naprawiajÄ powaÅny bÅÄd
-bezpieczeÅstwa. Przeczytaj <a
-href="http://archives.seul.org/or/announce/Aug-2007/msg00000.html";>informacje
-o wydaniu</a>, by poznaÄ szczegÃÅy.</li>
-
-<li>Luty 2007: Projeky Tor i UColo/Boulder <a
-href="http://blogs.law.harvard.edu/anonymous/2007/02/26/the-rumors-of-our-demise/";>odpowiadajÄ</a>
-na niedawnÄ burzÄ na blogach dotyczÄcÄ dokumentu opisujÄcego moÅliwÄ
-strategiÄ ataku na Tora.</li>
-
-<li>StyczeÅ 2007: SieÄ Tora urosÅa do setek tysiÄcy uÅytkownikÃw. Deweloperzy
-nie dajÄ rady z wprowadzaniem nowych rzeczy, naprawianiem bÅÄdÃw i
-dokumentacjÄ.  <a href="<page volunteer>">Potrzebujemy Twojej pomocy!</a></li>
-
-<li><b>Szukamy sponsorÃw i nowych ÅrÃdeÅ finansowania.</b> JeÅli uwaÅasz, Åe
-Twoja organizacja moÅe nam pomÃc, <a href="<page contact>">skontaktuj siÄ z
-nami</a>.  Sponsorzy mogÄ liczyÄ na zwiÄkszone zainteresowanie, lepsze
-wsparcie, reklamÄ (jeÅli sobie tego ÅyczÄ) oraz zwiÄkszony wpÅyw na kierunek
-badaÅ i rozwoju.  <a href="<page donate>">Prosimy o zÅoÅenie dotacji.</a></li>
-
-</ul>
-
-</div>
-
-
-
-#include <foot.wmi>

Modified: website/trunk/pl/people.wml
===================================================================
--- website/trunk/pl/people.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/people.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -222,10 +222,9 @@
 serwerÃw proxy dla klientÃw Tora na Windows.</dd>
 <dt>rovv (to jest pseudonim -- udaÅo mu siÄ pozostaÄ anonimowym nawet dla nas!)</dt><dd>Najbardziej oddany czÅowiek zgÅaszajÄcy bÅÄdy jakiego znamy. Musi czytaÄ kod
 ÅrÃdÅowy Tora codziennie przy Åniadaniu.</dd>
-<dt>tup (to teÅ jest pseudonim)</dt><dd>Okresowo dodaje nowe cechy, ktÃre czyniÄ Tora Åatwiejszym w uÅywaniu jako <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TransparentProxy";>przezroczyste
-proxy</a>. Zajmuje siÄ teÅ <a href="http://p56soo2ibjkx23xo.onion/";>kodem
-TorDNSEL</a>.</dd>
+<dt>tup (to teÅ jest pseudonim)</dt><dd>Periodically adds new features for making Tor easier to use as a <a
+href="<wiki>TransparentProxy">transparent proxy</a>. Also maintains the <a
+href="http://p56soo2ibjkx23xo.onion/";>TorDNSEL code</a>.</dd>
 <dt>Kyle Williams</dt><dd>Deweloper JanusVM, przezroczystego proxy Tora opartego na VMWare, ktÃre
 uÅatwia zainstalowanie i uÅywanie Tora.</dd>
 <dt>Ethan Zuckerman</dt><dd>Blogger, ktÃry napisaÅ kilka <a
@@ -252,19 +251,20 @@
 href="https://svn.torproject.org/svn/topf/trunk/README";>TOPF</a>, fuzzerem
 (rozmazywaczem) dla Tora; prowadzony przez Rogera.</dd>
 <dt>Ren Bucholz</dt><dd>Nasze Åadne logo i obrazki.</dd>
-<dt>Fallon Chen</dt><dd> PracowaÅ nad polepszeniem wyboru ÅcieÅki Tora (<a
-href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/";>svn</a>)
-i <a href="<gitblob>doc/spec/proposals/151-path-selection-improvements.txt"
->propozycjÄ 151</a> jako czÄÅÄ Google Summer of Code 2008.</dd>
+<dt>Fallon Chen</dt><dd> Worked on Improving Tor Path Selection (<a
+href="https://svn.torproject.org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/";>svn</a>)
+and <a
+href="<gitblob>doc/spec/proposals/151-path-selection-improvements.txt">proposal
+151</a> as part of Google Summer of Code 2008.</dd>
 <dt>Bram Cohen</dt><dd>PomÃgÅ zaprojektowaÄ nasz mechanizm kontroli zatorÃw we wczesnych dniach
 Tora.</dd>
 <dt>Pat Double</dt><dd>TwÃrca Incognito LiveCD.</dd>
 <dt>Geoff Goodell</dt><dd>ZaczÄÅ <a href="https://svn.torproject.org/svn/blossom/trunk/";>projekt
 Blossom</a>, ktÃry uÅywa Tora jako sieci nadrzÄdnej; pomÃgÅ teÅ zmotywowaÄ
 protokÃÅ kontroli Tora, by byÅ tak elastyczny, jak jest dziÅ.</dd>
-<dt>Aleksei Gorny</dt><dd> Pracuje nad ulepszeniami skanera wyjÅciowego Tora (<a
-href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/";>svn</a>),
-zaczÄtymi jako czÄÅÄ Google Summer of Code 2008.</dd>
+<dt>Aleksei Gorny</dt><dd> Working on Tor exit scanner improvements (<a
+href="https://svn.torproject.org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/";>svn</a>),
+originally started as part of Google Summer of Code 2008.</dd>
 <dt>Christian Grothoff</dt><dd> DaÅ nam lepsze zachowanie demonizujÄce.</dd>
 <dt>Steven Hazel</dt><dd> SprawiÅ, Åe 'make install' robi to, co trzeba.</dd>
 <dt>Justin Hipple</dt><dd>Kolejny deweloper programu Vidalia.</dd>
@@ -300,9 +300,9 @@
 moÅna znaleÅÄ na <a
 href="http://www.eff.org/about/staff/?f=fred_von_lohmann.html";>Stronie
 Personelu EFF</a>.</dd>
-<dt>Christian Wilms</dt><dd> PracowaÅ nad sposobami polepszenia wydajnoÅci usÅug ukrytych Tora (<a
-href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";>svn</a>)
-jako czÄÅÄ Google Summer of Code 2008.</dd>
+<dt>Christian Wilms</dt><dd> Worked on Performance Enhancing Measures for Tor Hidden Services (<a
+href="https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-perf/";>svn</a>)
+as part of Google Summer of Code 2008.</dd>
 <dt>Jillian C. York</dt><dd><a href="http://jilliancyork.com/";>Jillian C. York</a> jest pisarkÄ,
 blogerkÄ i aktywistkÄ w Bostonie. Bloguje o sposobach korzystania z Tora i
 anonimowoÅci w <a

Modified: website/trunk/pl/tormedia.wml
===================================================================
--- website/trunk/pl/tormedia.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/tormedia.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -489,13 +489,12 @@
 <tr style="background-color: #e5e5e5;">
 <td>1 Lutego 2008</td>
 <td>PC World</td>
-<td><a href="http://www.pcworld.com/article/id,142094-pg,1/article.html";
->Badania twierdzÄ, Åe hakerzy mogÄ odkrywaÄ osoby maskujÄce siÄ podczas
-surfowania po sieci</a> Raport na temat <a
-href="http://www.lightbluetouchpaper.org/2007/12/10/covert-channel-vulnerabilities-in-anonymity-systems/";
->niedawnej tezy w pracy naukowej Stevena Murdocha </a>. Steven <a
-href="http://blog.torproject.org/blog/media-coverage-%2526quot%3Bcovert-channel-vulnerabilities-anonymity-systems%2526quot%3B";
->odpowiada na Blogu Tora</a>.</td>
+<td><a href="http://www.pcworld.com/article/id,142094-pg,1/article.html";>
+Hackers Can Expose Masked Surfers, Study Says</a> A report on <a
+href="http://www.lightbluetouchpaper.org/2007/12/10/covert-channel-vulnerabilities-in-anonymity-systems/";>
+Steven Murdoch's recent PhD thesis</a>. Steven <a
+href="<blog>media-coverage-%2526quot%3Bcovert-channel-vulnerabilities-anonymity-systems%2526quot%3B">
+responds on the Tor Blog</a>.</td>
 </tr>
 <tr style="background-color: #e5e5e5;">
 <td>21 WrzeÅnia 2007</td>

Modified: website/trunk/pl/translation-overview.wml
===================================================================
--- website/trunk/pl/translation-overview.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/translation-overview.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -46,12 +46,13 @@
 </p>
 
 <p>
-By zaczÄÄ uÅywaÄ naszej strony tÅumaczeÅ, musisz siÄ zarejestrowaÄ, by
-otrzymaÄ konto. WejdÅ na <a
-href="https://translation.torproject.org/register.html";>stronÄ rejestracji
-konta</a>, by zaczÄÄ rejestracjÄ. Podaj prawidÅowy adres e-mail i mocne
-hasÅo. Po wypeÅnieniu formularza i naciÅniÄciu przycisku "Zarejestruj konto"
-('Register Account'), powinieneÅ zobaczyÄ wiadomoÅÄ, Åe wszystko siÄ udaÅo: 
+To get started using our translation website, you need to sign up for an
+account. Visit the <a
+href="https://translation.torproject.org/accounts/register/";>account
+registration page</a> to get started. Be sure to enter a proper email
+address and a strong password. After you fill in the form and use the
+'Register Account' button, you should see some text indicating that things
+worked out: 
 </p>
 <pre>
 Account created. You will be emailed login details and an activation code.
@@ -139,14 +140,15 @@
 </p>
 
 <p>
-Gdy skoÅczyÅeÅ/aÅ, musisz wysÅaÄ swoje zmiany. WrÃÄ na stronÄ z <a
-href="https://translation.torproject.org/de/vidalia/index.html?editing=1";>funkcjami
-edycji</a>, i kliknij link "<a
-href='https://translation.torproject.org/de/vidalia/index.html?editing=1&amp;docommit=1&amp;commitfile=vidalia_de.po'>Commit</a>".
-To wyÅle Twoje zmiany do <a
-href="https://svn.torproject.org/svn/translation/trunk/projects/vidalia/de/";>ModuÅu
-subversion do tÅumaczeÅ</a> do wÅaÅciwego miejsca wzglÄdem jÄzyka i projektu
-(Vidalia i niemiecki w tym przypadku).
+When you're finished, you need to commit your changes. Return to the page
+with the <a
+href="https://translation.torproject.org/de/vidalia/index.html?editing=1";>Editing
+Functions</a>, and click on the "<a
+href='https://translation.torproject.org/de/vidalia/index.html?editing=1&amp;docommit=1&amp;commitfile=vidalia_de.po'>Commit</a>"
+link. This will commit your changes into the <a
+href="https://trac.vidalia-project.net/browser/vidalia/trunk/src/vidalia/i18n";>Translation
+subversion module</a> in the specific area as specified by your choices of
+language and project (Vidalia and German, for this example).
 </p>
 
 <p>

Deleted: website/trunk/pl/tshirt.wml
===================================================================
--- website/trunk/pl/tshirt.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/tshirt.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor: T-shirt" CHARSET="UTF-8"
-<div class="main-column">
-
-<h2>Tor: Koszulka za wkÅad do projektu</h2>
-<hr />
-
-<p>MoÅesz otrzymaÄ jednÄ z tych Åadnych koszulek Tora za wkÅad do projektu
-Tor. SÄ trzy podstawowe sposoby wnoszenia wkÅadu:</p>
-
-<ol>
-<li>WystarczajÄco duÅa (65 USD lub wiÄcej) <a href="<page donate>">dotacja</a>
-na Projekt Tor.</li>
-<li>Prowadzenie szybkiego <a href="<page docs/tor-doc-relay>">przekaÅnika sieci
-Tor</a>, ktÃry dziaÅaÅ przez ostatnie 2 miesiÄce: kwalifikujesz siÄ, jeÅli
-pozwalasz na wyjÅcie na port 80 i masz ÅredniÄ szybkoÅÄ transferu 100 KB/s,
-lub jeÅli nie prowadzisz wÄzÅa wyjÅciowego, lecz masz ÅredniÄ szybkoÅÄ
-transferu 500 KB/s.</li>
-<li>Pomaganie na <a href="<page volunteer>">inne sposoby</a>. <a href="<page
-translation>">Prowadzenie tÅumaczenia strony Tora</a>. Napisanie dobrego <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>programu
-wspierajacego, ktÃrego uÅywaÅoby wielu ludzi</a>. Przeprowadzenie badaÅ nad
-Torem i anonimowoÅciÄ, usuniÄcie paru <a
-href="https://bugs.torproject.org/";>naszych bÅÄdÃw</a> lub rozgÅaszanie
-informacji o Torze.
-</li>
-</ol>
-
-<p>
-JeÅli kwalifikujesz siÄ, wyÅlij list na adres donations maÅpa torproject
-kropka org z krÃtkim uzasadnieniem. PamiÄtaj podaÄ preferencje co do koloru,
-rozmiar (S/M/L/XL/XXL), zapasowy rozmiar jeÅli pierwszy jest niedostÄpny i
-adres pocztowy, pod ktÃry koszulka ma byÄ dostarczona.
-</p>
-
-<p>
-MoÅesz wybraÄ miÄdzy tradycyjnym czarnym a zachÄcajÄcym do rozmowy
-jasnozielonym kolorem.  MoÅesz takÅe zobaczyÄ koszulki <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorShirt";>w
-akcji</a> &mdash; dodaj tu takÅe swoje zdjÄcia.
-</p>
-
-<div style="text-align: center">
-<a href="tshirt/black-tor-tshirt.png"><img src="tshirt/black-tor-tshirt.png"
-/></a> <a href="tshirt/green-tor-tshirt.png"><img
-src="tshirt/green-tor-tshirt.png" /></a>
-</div>
-
-  </div>
-
-
-
-#include <foot.wmi>

Modified: website/trunk/pl/volunteer.wml
===================================================================
--- website/trunk/pl/volunteer.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/pl/volunteer.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -40,14 +40,11 @@
 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://trac.torproject.org/projects/tor/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://trac.torproject.org/projects/tor/wiki/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="<wiki>TorifyHOWTO">our list of programs</a>
+that can be configured to use Tor.</li>
+<li>We have a huge list of <a href="<wiki>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>
@@ -179,34 +176,33 @@
 </li>
 
 <li>
-<b>Polepszanie naszych zdolnoÅci opierania siÄ cenzurze</b> <br />
-Priorytet: <i>Åredni do wysokiego</i> <br /> Poziom wysiÅku: <i>Åredni do
-wysokiego</i> <br /> Poziom umiejÄtnoÅci: <i>Wysoki</i> <br /> Prawdopodobni
-opiekunowie: <i>Nick, Roger, Steven</i> <br /> Wersje 0.2.1.x Tora robiÄ <a
-href="<svnprojects>design-paper/blocking.html">znaczne postÄpy</a> w
-opieraniu siÄ narodowej i firmowej cenzurze. Ale Tor ciÄgle potrzebuje
-lepszych mechanizmÃw w niektÃrych czÄÅciach projektu anty-cenzurowania. <br
-/> JednÄ z duÅych kategorii jest dodawanie funkcjonalnoÅci do naszej usÅugi
-<a href="http://gitweb.torproject.org//bridgedb.git?a=tree";>bridgedb</a>
-(Python). Tor chce dawaÄ <a href="<page bridges>">adresy przekaÅnikÃw
-mostkowych</a> uÅytkownikom nie mogÄcym bezpoÅrednio poÅÄczyÄ siÄ z sieciÄ
-Tora, ale trwa wyÅcig zbrojeÅ miÄdzy algorytmami dystrybucji adresÃw a
-algorytmami do zbierania i blokowania adresÃw. Przeczytaj <a
-href="https://blog.torproject.org/blog/bridge-distribution-strategies";>nasz
-wpis o tym na blogu</a> jako wprowadzenie, a potem spÃjrz na <a
-href="http://archives.seul.org/or/dev/Dec-2009/msg00000.html";>post Rogera na
-or-dev</a> z grudnia, by poznaÄ nowsze pomysÅy &mdash; pozostaÅo do
-zrobienia wiele pracy projektowej. <br /> JeÅli chcesz wejÅÄ bardziej we
-wnÄtrze samego Tora (C), pomniejszym problemem, ktÃrym powinniÅmy siÄ zajÄÄ
-jest to, Åe bieÅÄce wersje mogÄ nasÅuchiwaÄ poÅÄczeÅ tylko na jednym
-zestawie adres/port na raz. Istnieje <a
-href="<gitblob>doc/spec/proposals/118-multiple-orports.txt">propozycja
-zajÄcia siÄ tÄ sprawÄ</a> i umoÅliwienia klientom ÅÄczeniÄ siÄ z danym Torem
-na wielu adresach i portach, ale wymaga to wiÄcej pracy.<br /> Ten projekt
-zawiera wiele badaÅ i projektowania. Jednym z wiÄkszych wyzwaÅ bÄdzie
-zidentyfikowanie i umiejÄtne wykorzystanie rozwiÄzaÅ, ktÃre oprÄ siÄ atakom
-nawet po tym, jak atakujÄcy pozna projekt, po czym rÃwnowaÅenie odpornoÅci
-na cenzurÄ z uÅytecznoÅciÄ i siÅÄ.
+<b>Improving Tor's ability to resist censorship</b> <br /> Priority:
+<i>Medium to High</i> <br /> Effort Level: <i>Medium to High</i> <br />
+Skill Level: <i>High</i> <br /> Likely Mentors: <i>Roger, Nick, Steven</i>
+<br /> The Tor 0.2.1.x series makes <a
+href="<svnprojects>design-paper/blocking.html">significant improvements</a>
+in resisting national and organizational censorship.  But Tor still needs
+better mechanisms for some parts of its anti-censorship design.  <br /> One
+huge category of work is adding features to our <a
+href="http://gitweb.torproject.org//bridgedb.git?a=tree";>bridgedb</a>
+service (Python). Tor aims to give out <a href="<page bridges>">bridge relay
+addresses</a> to users that can't reach the Tor network directly, but
+there's an arms race between algorithms for distributing addresses and
+algorithms for gathering and blocking them. See <a
+href="<blog>bridge-distribution-strategies">our blog post on the topic</a>
+as an overview, and then look at <a
+href="http://archives.seul.org/or/dev/Dec-2009/msg00000.html";>Roger's or-dev
+post</a> from December for more recent thoughts &mdash; lots of design work
+remains.  <br /> If you want to get more into the guts of Tor itself (C), a
+more minor problem we should address is that current Tors can only listen on
+a single address/port combination at a time. There's <a
+href="<gitblob>doc/spec/proposals/118-multiple-orports.txt">a proposal to
+address this limitation</a> and allow clients to connect to any given Tor on
+multiple addresses and ports, but it needs more work.  <br /> This project
+could involve a lot of research and design. One of the big challenges will
+be identifying and crafting approaches that can still resist an adversary
+even after the adversary knows the design, and then trading off censorship
+resistance with usability and robustness.
 </li>
 
 <li>
@@ -561,12 +557,12 @@
 </li>
 
 <li>
-<b>PrzynieÅ nowe pomysÅy!</b> <br />Nie podoba Ci siÄ Åaden z tych pomysÅÃw?
-SiÄgnij do <a href="<gitblob>doc/roadmaps/2008-12-19-roadmap-full.pdf">planu
-rozwoju Tora</a> po wiÄcej pomysÅÃw lub po prostu wyprÃbuj Tora, VidaliÄ,
-Torbutton i dowiedz siÄ, co Twoim zdaniem wymaga poprawy. NiektÃrym z <a
-href="<gittree>doc/spec/proposals/">bieÅÄcych propozycji</a> teÅ moÅe
-brakowaÄ deweloperÃw.
+<b>Bring up new ideas!</b> <br /> Don't like any of these? Look at the <a
+href="<svnprojects>roadmaps/2008-12-19-roadmap-full.pdf">Tor development
+roadmap</a> for more ideas, or just try out Tor, Vidalia, and Torbutton, and
+find out what you think needs fixing.  Some of the <a
+href="<gittree>doc/spec/proposals">current proposals</a> might also be short
+on developers.
 </li>
 
 </ol>
@@ -575,18 +571,16 @@
 <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://trac.torproject.org/projects/tor/wiki/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="<wiki>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
@@ -615,15 +609,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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#YoushouldtransportallIPpacketsnotjustTCPpackets.";>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="<wiki>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

Added: website/trunk/press/ru/2008-12-19-roadmap-press-release.wml
===================================================================
--- website/trunk/press/ru/2008-12-19-roadmap-press-release.wml	                        (rev 0)
+++ website/trunk/press/ru/2008-12-19-roadmap-press-release.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision: 22077 $
+# Translation-Priority: 4-optional
+#include "head.wmi" TITLE="THE TOR PROJECT ANNOUNCES THREE-YEAR DEVELOPMENT ROADMAP" CHARSET="UTF-8"
+<div class="main-column">
+
+
+
+<!-- PUT CONTENT AFTER THIS TAG -->
+<h2>ÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ</h2>
+
+<h2><strong>ÐÐÐÐÐÐ TOR ÐÐÐÐÐÐÐÐÐ Ð ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÐ</strong></h2>
+
+<p><strong>DEDHAM, MA</strong> - ÐÑÐÐÐÑ Tor ÐÐÑÐÐÐÐÐÐÐÐ ÑÐÐÐ <a
+href="/press/presskit/2008-12-19-roadmap-full.pdf">ÐÐÐÐ ÑÐÐÐÐÑÐÑ ÐÐ ÑÑÐ
+ÐÐÐÐ</a>, ÐÐÑÐÑÑÐ ÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÐÑÑÐÐÐÐÐÐÐ ÐÐÑÑÑÑÐÐÐÑÐÐ ÐÐÑÐ-ÑÐÐÐÑÑÑ Ð
+ÑÐÑÐÐÑÐÐ ÐÐÑ ÑÐÐÐÐÑÐÑ ÐÐÑÐÑÐÐÑ-ÑÐÐÐÐÐÑ Ð ÐÐÐÑÑÑÑÑ ÐÐÑÐÑÑÐÐÑ. </p>
+
+<p>ÐÐÑÑÑÑÐÐÐÑÑ Ð ÑÐÑÐÐÐÐÐÐÐ Tor ÑÐÐ ÐÑÐÐÐÑÐÑÑÑÑÑ ÑÐÑÐÑÐÐ ÑÑÑÑÑ ÐÑÐÐÐ ÐÐÑ ÐÐÑÐÑÑ
+ÐÑ ÐÐÑÑÐÐÑÐÐÑÑÐ ÐÐÐÐÐÐ. ÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÑÑÐÑÑ Ð ÑÐÐÑ ÐÑÑÐÐÐÐÑÑÐÐ Ð
+ÐÐÑÐÑÐÐÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÐ, ÐÐÑÐÑÑÐÑÑÑ Ñ ÐÑÐÐÐÐÐÑÐÐÐÐ Ð ÐÐÑÑÐÐÐÐÑÐÐÐ Ð ÑÑÑÐÐÐÑ
+Ñ ÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐÑÐÐÐ  ÑÐÐÐÐÐÐ. ÐÑÐÐÐÑÐÑÑ Tor, ÐÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÑÑÐÐÐ
+ÑÐÑÑÐÐÑÑÑ ÐÐÐÐÐÐÐÐÐÑÑ ÐÑÐ ÐÐÐÑÐÑÐÑÑ Ð ÐÐÑÐÑÐÐÑÐ, ÑÐÐÐÐ ÐÐÐ Ð ÐÑÐÐ, ÐÐÑÐÑÑÐ
+ÐÐÑÑÑ ÑÐÑÐÐÐÑÐÐ ÑÑÐÑÑÐÐÑÐÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÑÐÑ (ÐÐÐÑÐÐÐÑ, ÐÐÑÑÐÑ
+ÐÐÐÐÑÐÐÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÐÑÐÐÑÑÑÐ) Ð ÑÑÑÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐÐÑÐÐ. ÐÐÑÑ Tor ÑÐÐÐÐ
+ÐÑÐÐÐÑÑÐÐÐÑÐÑ ÐÐÑÐÑÑ ÐÑÐÑÐ, ÐÐÑÐÑÑÐ ÐÑÑÑ ÐÑÑÐÐÐÐ ÑÑÐÐÐÑ ÑÐÐÑÐÑÐÐÑÑÐ ÐÐ
+ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐ Ð ISP, ÑÐÐÐÑÐÑÑÐÑ ÑÐÑÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐÐÑÑÐÑ ÐÐ ÐÑ
+ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐ. </p>
+
+<p>ÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÑ Tor ÐÑÐÐ ÐÑÐÐÐÑÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÑÐ, ÐÐÐÐÐÐ ÐÑÐÐ ÐÐ
+ÐÑÐÐÑ ÐÐÑÑ ÐÑÐÐÐÑÐÑÑÑ Tor ÑÐÐÐÐ Ð  ÐÐÑ ÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑ-ÑÐÐÐÑÑÑ. <a
+href="http://www.hrw.org/";>Human Rights Watch</a> Ð <a
+href="http://globalvoicesonline.org/";>Global Voices Online</a> ÑÐÐÐÐÐÐÐÐÐÐÐÐ
+Tor Ð ÐÐÑÐÑÑÐÐ ÐÐÑÑÑÑÐÐÐÑÐ ÐÐÑÐÐÐ ÑÐÐÐÑÑÑ Ð ÑÐÐÑÐÑÑÐÐÐÑÑ ÐÐÑÑÐÐÑÑÑÐÐÑ. ÐÐÐÐ
+ÑÑÐÐÑÑÐÑÐÐÐÐ ÐÐ ÐÑÐÐÐÑÑÐÐÐÐÐÐÐ ÐÐÑÑÑÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐÑÑÑ Ð ÑÐÑÐÐÑÐÐ ÐÐÑ
+ÑÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÐÐÑ-ÑÐÐÐÐÐÑ Ð ÐÐÐÑÑÑÑÑ ÐÐÑÐÑÑÐÐÑ.</p>
+
+<p>"ÐÑÐÐ ÐÐÑ ÐÐÑÐÑÐÐÑ-ÐÑÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑ ÐÐÐÐÑÑ, ÐÐÐÐÐ ÑÐÐÑÑ ÐÑ ÐÐÑÐÑÐÐÑÐ, ÑÑÐ
+ÑÐÐÐÐ ÐÐÐÐÑÐÐÑ, ÑÑÐ ÐÐ ÐÐ ÐÐÐÐÑ ÐÐÐÐÐÑÐÐÐÑÑ ÐÐÑ ÐÐÑÑÑÐ ÐÐ ÑÐÐÑÑ, ÐÐÑÐÑÑÐ ÐÐ
+ÐÐ ÑÐÑÐÑ, ÑÑÐÐÑ ÐÑ ÐÐÑÐÑÐÐÐ" - ÑÐÐÐÐÐ ÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐ - ÐÑÐÐÐÐÐÐÑÐÐÑ
+ÐÑÐÐÐÑÐ Tor. Â"ÐÑÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÑÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐÐ
+ÑÐÐÐÐÑÑ Tor ÐÑÐ ÐÑÑÑÐ Ð ÐÐÑÑÐÐ ÐÑÐÑÐÐ ÑÐÐÑÑÑÑ. Ð ÑÐÑÐÐÐÐ ÑÑÐÑ ÐÐÑ
+ÑÐÐÐÐÑÐÑÐÐÐÐÐÑ ÐÑ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÑ, ÐÐÐÐÐÐ ÑÐÐÐÐ, Ð ÐÑ
+ÐÐÐÐÑ ÑÑÐÐÑÑÐÑÐÐÐÑÑÑÑ ÐÐ ÑÐÐÐÐÑÐÐ Ð ÐÐÑÑÐÐÐÐÐÐ ÑÐÐÐ, ÑÑÐ ÐÑÐ ÐÑÐÐ, ÐÐÑÐÑÑÐ
+ÑÐÑÑÑ ÐÑÐÐÐÑÐÐÐÐÑÑ Tor, ÐÐÐÑÑ Ñ ÐÐÐ ÐÐÑÐÐÐÑÑÑÑ."</p>
+
+<p>Tor ÐÑÐÐÐÐÑÐÐÑ ÐÑÑÐÐÑ ÑÐÐÐÑÐÑÐÐ ÐÑÐÑÐÐÐÐÐÐÑÑÑÑ Ð <a
+href="https://www.torproject.org/sponsors";>ÑÐÐ ÑÑÑÐÑÑÐÑÑÑÐÐ</a>; ÑÐÐÐÐ ÐÐÐ
+Broadcasting Board of Governors, ÐÐÐÐ NLnet Ð ÑÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÑÐÑÑ
+ÑÐÐÐÑÐÑÐÐ. Ð ÑÐ ÐÑÐÐÑ, ÐÐÐ ÐÐÐÑÑÐÐÐÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÑ ÑÐÐÐÐÑÐÑÐÐÐÐÐÑ
+ÐÐÑÑÐÑÐÑÐÐ, ÑÑÐÐÑ ÐÐÑÐÑÑ ÐÐÐÑÑÐÐÑ, ÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÐ, ÐÐÐÐÐÑÐÑÐÐÑÐÑÐ  2,1
+ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐ ÐÑÐÐÑÐÑÑÑ ÐÐÐÐ Ð ÐÐÐÐÐÐÑÐ ÐÐÑÑÑÑÐÐÐÑÑ.</p>
+
+<h2>Ð ÐÐÐÐÐÐÐ TOR</h2>
+
+<p>ÐÐÑÐÐÑÑÑ Ð ÐÐÐÑÐÐÐ, MA, ÐÑÐÐÐÑ Tor ÑÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐ
+ÐÐÐÑÐÐÑÐÐÐÐ Ñ ÐÑÐÑÑÑÑÐ ÐÐÐÐÐ, ÐÐÑÐÑÐÐ ÐÑÐÐÐÑÑÐÐÐÑÐÑ ÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐÑÑÑ
+ÐÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÑÐ. Tor ÑÐÐÑÐÑÑÑ ÑÐÐÑÐÑÑÐÑÐÐ ÑÐÐÐÐÑÑÐÐÐ
+ÑÐÐÐÑÑ Ñ ÐÐÐÐÑÐÑÐÑÐÐÐ ÐÐÐÐÐÐ-ÐÐÑÑÐÐÑ ÐÑÑÐÐÐÐÐÐÐÐÐ ÐÐÐ, ÐÐÑÐÐÑÐÐÑÑ Ð 2001Ð. Ð
+2006Ð. ÐÑÐÐÐÑ ÑÑÐÐ ÐÑÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐÐÐ ÐÐÐ. ÐÐÐÑÐÑ
+ÐÑÐÐÐÑ Tor ÑÐÐÐÑÐÐÑ Ñ ÑÐÑÑÐÑÐÐ ÐÐÑÐÐÐ, ÐÐÐ, ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ
+ÐÑÐÐÐÐÐÑÑÐÐÐ Ð ÐÐÐÐÐÑÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÑ, ÑÑÐÐÑ ÐÐÐÐÑÑ ÐÐ
+ÐÐÑÐÑÐÑÑ ÐÑ ÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐÑÑÑ. </p>
+
+<p>ÐÐÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ ÑÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÐÐÑÐÐÐÐÑ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÑ
+ÐÐÐÐÐÐÐÐÑÑÐ Tor Ð ÑÐÑÐ Tor, ÐÑÐÐÐÑ Tor ÑÐÐÐÐ ÐÐÐÐÐÐÐÑ ÐÑÑÐÐÐÐÐÐÑÐÐÑÐ Ð
+ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ, ÐÐÐ ÐÐÑÑÑÐÐÑÑ Ð ÐÐÐÐÑÐÑÑ ÐÐÑÑÑÐÐÐÑÑÐÐÑÐ Ð ÐÐÐÐÐÐÑÐÑÐ
+ÐÐÐÐÐÐÐÑÐ ÑÐÑÐ. ÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÐÐÑÑÐÐÐ Tor ÐÑÐÐÐÐÑÑÑ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÑ
+ÐÑÑÐÐÐÐÐÐÑÐÐÑÑÐÐÑ ÑÐÐÐÑ ÐÐ ÐÐÐÑÑÐÑ ÐÐÑÑÐÑÑ ÐÐÐÑÐÑÐÐÑÐÑÑ ÐÐ ÐÐÐÑÐÐÑÐÐÐÑ
+ÐÐÐÐÐÐÑÐÐÑÑÐ, Ð ÐÐÑÑÐ ÐÐÐÐÐÑ ÐÑÑÐÐÐÑ ÐÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐÑÐÐÑÐ ÐÐ
+ÑÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÑÑÑ ÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐ Ð Tor.</p>
+
+<p>ÐÐÐÐÑÐÐÑ "Onion Logo" Ð "Tor" ÑÐÐÑÑÑÑÑ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÐÐÑÐÐ ÑÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ
+ÐÑÐÐÐÑÐ Tor.</p>
+
+<p>ÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐ: ÐÐÐÑÑ ÐÑÑÐÐÐ</p>
+<p>ÐÐÐ: +1-781-424-9877</p>
+<p>ÐÐÐÐÑÑÐÐÐÐÑ ÐÐÑÑÐ: execdir@xxxxxxxxxxxxxx</p>
+<p><a href="https://www.torproject.org/";>ÐÐÐÑÐÐÑ: ÐÑÐÐÐÑ Tor</a></p>
+<div align=center>###</div>
+
+</div>
+
+
+#include <foot.wmi>

Added: website/trunk/press/ru/2009-03-12-performance-roadmap-press-release.wml
===================================================================
--- website/trunk/press/ru/2009-03-12-performance-roadmap-press-release.wml	                        (rev 0)
+++ website/trunk/press/ru/2009-03-12-performance-roadmap-press-release.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision: 22077 $
+# Translation-Priority: 4-optional
+#include "head.wmi" TITLE="TOR PROJECT LAUNCHES PERFORMANCE ROADMAP AND CAMPAIGN" CHARSET="UTF-8"
+<div class="main-column">
+
+
+
+<!-- PUT CONTENT AFTER THIS TAG -->
+<h2>ÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ</h2>
+
+<h2><strong>ÐÐÐÐÐÐ TOR ÐÐÐÐÐÐÐÐÐ ÐÐÐÐ Ð ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐ</strong></h2>
+
+<p><strong>DEDHAM, MA</strong> -ÐÑÐÐÐÑ Tor <a
+href="/press/presskit/2009-03-11-performance.pdf">ÐÐÐÑÑÑÐÐ ÐÐÐÐ</a>
+ÐÐÐÑÐÑÐÐÑÐÐÐÐ ÑÐÑÑÑÐÐÐÑ ÑÐÐÑÐÑÑÐÑÐÐÐÐÑÑÐ ÑÐÑÐ Tor ÐÐ ÑÐÐÐÑÑÑÐÐ
+ÐÐÐ. ÐÐÑÐÑÐÐÐÐ ÑÑÑÐÑÑÐÑÑÑÐÐÐ ÑÐÐÐÐÑÐÑÐÐÐÐÐÑ Ñ ÐÐÐÐÑÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐ
+ÐÐÐÑÐÐÑÐÑ ÑÑÐÐÑ ÐÐ ÑÐÐÐÑÑÑÐÐ 12 ÐÐÑÑÑÐÐ. ÐÑÐ ÐÐÐÐÐÐÐÑ ÑÐÐÑÐÑÑÑ ÐÑÑÐÑÐ
+ÑÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐÐÐÐÐÐÐ <a href="<page press/2008-12-19-
+roadmap-press-release>">ÑÑÐÑÐÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÑÐÑ</a>.  ÐÐÐÐ ÐÐÐÑÑÐÐÑ Ð
+ÑÐÐÑ ÐÑÑÐÐÐÐÐÐÐÐÑ Ð ÐÐÐÑÑÐÐÑ ÐÑ ÑÐÐÐÐÑÐÑÑ ÑÐÑÑÑÑÐÐ, ÐÐÑÐÑÑÐ ÐÐÑÐÐÐÐÑÑÑ
+ÑÐÐÐÑÑÑÐÐ ÑÐÐÐ ÐÐÑ ÑÐÑÑÑÐÐÐÑ ÑÐÐÑÐÑÑÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÑÐÐÐ ÑÐÑÐ Tor. ÐÐÐÑÐ
+ÐÐÐÑÑÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÑÐÑÐ Tor ÑÐÐÑÐÑÑÑ ÑÐÐÐÐÑÐÐÐÐ ÑÐÐÑÐÑÑÐÑÐÐÐÐÑÑÐ
+ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÑÐ. </p>
+
+<p>Ð ÑÐÑÑÐÐ ÑÐÑÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ Tor ÐÐÑÑÑÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐÑÐÐÑÑÑ ÑÐÑÐ Tor. Ð
+ÑÐÑÐÐÐÐ ÐÐÑÐÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐÑ ÐÐÑ ÑÐÐÐÐÑÐÑÐÐÐÐÐÐ Tor (Ð ÑÐÐÐÐ Ð ÑÑÐÐÐÑ
+ÑÐÐÑÐÐÐÑÑÐÐÐÐ) ÐÑÐÐ ÑÑÐÐÑÑÐÑÐÐÐÐÑ ÐÐ ÐÑÐÑÑÐÑÐ ÐÑÐÐÐÑÐÐÐÐÐÐÑ Ð ÑÑÑÐÐÑÐÐÐÑÑÐ
+ÐÑÐÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑ. Ð ÐÑÐÐÐ ÐÑ ÐÐÐÑÑÐÐÐ ÐÐÑÑÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÑÐÑÐÑÐÑÐ ÐÐÐÐÑ
+Windows; ÐÐÐÐÑÑÐÐ Ð ÐÐÐÑÑÐÐÐ ÐÐÑÑÑÑÐÐÐÑÑ ÐÐÑ ÑÐÑÐÐÐÐÐÐÑ ÐÑÐÐÑÑÐÑÑÐÐ ÐÐÐÐÐ
+ÐÐÐÑÑÐÐÐÐÑ ÑÐÐÐÑÑÑ; ÐÐÐÑÐÐÐÑÑÑ ÑÐÐÑÐÐÐÑÐÑ ÐÐÐÐÐÑÐÐÐÐÑÑÐÑ ÐÑÐÐÐÐÐÐÐÐ, ÑÐÐÐÑ
+ÐÐÐ Vidalia, Torbutton Ð Thandy; ÐÑÐÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑÐ ÐÑÑÑÑÑ
+ÐÐÐÐÐÐÐÐÑÑÑ ÐÑÑÑ ÑÐÑÑÐÐÑÐÑÑÐÑÐÐÐ, ÐÐÐÐÐÐÐ ÐÐÐÑÑÑÑ ÐÐÐÐÑÐÑÑ ÐÐÑÐÑ Ð ÐÐÐÐÐÐ
+ÐÑÐÑÐÑÐÑÐÐÐ ÐÐÑÐÑÑÐÐÑ Ñ ÐÐÐÐÐÑÐÐÐÐ uPnP; ÑÐÐÐÐÐÐ ÑÑÑÐÐÑÐÐÐÑÑ ÐÐÑÐÐÐÐÑÐÑÐÑÑ Ð
+ÐÐÐÐÐÐÐÐÑÐÑÑÐÑÑ ÐÐÐÐÐÐÐÑ, Ð ÑÐÐÐÐ ÐÐÑÑÐÑÑÑÑÐÑÑÑÑ; ÐÑÐÐÐ ÑÐÐÐ, ÑÐÑÐÑÐÑÑÑÐÐÐÐÐ
+ÐÐÐÐÐÐÐÐÐ Ð Tor ÐÐÐÐÐÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÐ ÑÑÑ Ð ÑÑÑÐ, ÐÐÑÐÑÑÐ ÐÐÑÑÐÐ
+ÐÐÐÐÐÐÐÐÑÑÐÐ ÑÐÐÐÐÑÐÐ. ÐÑÐ ÑÑÐ ÑÑÐÐÑÐ ÐÐÐÑÐÐ ÐÐÐÐÐ Ð ÑÐÐÐÐÑÐÐÐÐ ÐÐÐÑ
+ÐÐÐÑÐÐÐÐÑÐÐÐÐ Ð ÑÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÑÐÑÑ ÑÐÑÑ Tor.</p>
+
+<p>ÐÐÑÑÑÑÐÐÐÑÑ Ð ÑÐÑÐÐÐÐÐÐÐ Tor ÑÐÐ ÐÑÐÐÐÑÐÑÑÑÑÑ ÑÐÑÐÑÐÐ ÑÑÑÑÑ ÐÑÐÐÐ ÐÐÑ ÐÐÑÐÑÑ
+ÐÑ ÐÐÑÑÐÐÑÐÐÑÑÐ ÐÐÐÐÐÐ. ÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÑÑÐÑÑ Ð ÑÐÐÑ ÐÑÑÐÐÐÐÑÑÐÐ Ð
+ÐÐÑÐÑÐÐÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÐ, ÐÐÑÐÑÑÐÑÑÑ Ñ ÐÑÐÐÐÐÐÑÐÐÐÐ Ð ÐÐÑÑÐÐÐÐÑÐÐÐ Ð ÑÑÑÐÐÐÑ
+Ñ ÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐÑÐÐÐ ÑÐÐÐÐÐÐ. ÐÑÐÐÐÑÐÑÑ Tor, ÐÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÑÑÐÐÐ
+ÑÐÑÑÐÐÑÑÑ ÐÐÐÐÐÐÐÐÐÑÑ ÐÑÐ ÐÐÐÑÐÑÐÑÑ Ð ÐÐÑÐÑÐÐÑÐ, ÑÐÐÐÐ ÐÐÐ Ð ÐÑÐÐ, ÐÐÑÐÑÑÐ
+ÐÐÑÑÑ ÑÐÑÐÐÐÑÐÐ ÑÑÐÑÑÐÐÑÐÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÑÐÑ (ÐÐÐÑÐÐÐÑ, ÐÐÑÑÐÑ
+ÐÐÐÐÑÐÐÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÐÑÐÐÑÑÑÐ) Ð ÑÑÑÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐÐÑÐÐ. ÐÐÑÑ Tor ÑÐÐÐÐ
+ÐÑÐÐÐÑÑÐÐÐÑÐÑ ÐÐÑÐÑÑ ÐÑÐÑÐ, ÐÐÑÐÑÑÐ ÐÑÑÑ ÐÑÑÐÐÐÐ ÑÑÐÐÐÑ ÑÐÐÑÐÑÐÐÑÑÐ ÐÐ
+ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐ Ð ISP, ÑÐÐÐÑÐÑÑÐÑ ÑÐÑÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐÐÑÑÐÑ ÐÐ ÐÑ
+ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐ.</p>
+
+<p>Tor ÐÑÐÐÐÐÑÐÐÑ ÐÑÑÐÐÑ ÑÐÐÐÑÐÑÐÐ ÐÑÐÑÐÐÐÐÐÐÑÑÑÑ Ð <a
+href="https://www.torproject.org/sponsors";>ÑÐÐ ÑÑÑÐÑÑÐÑÑÑÐÐ</a>; ÑÐÐÐÐ ÐÐÐ
+Broadcasting Board of Governors, ÐÐÐÐ NLnet Ð ÑÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐÑÐÑÑ
+ÑÐÐÐÑÐÑÐÐ. Ð ÑÐ ÐÑÐÐÑ, ÐÐÐ ÐÐÐÑÑÐÐÐÑÑ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÑ ÑÐÐÐÐÑÐÑÐÐÐÐÐÑ
+ÐÐÑÑÐÑÐÑÐÐ, ÑÑÐÐÑ ÐÐÑÐÑÑ ÐÐÐÑÑÐÐÑ, ÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÐ, ÐÐÐÐÐÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐ
+ÐÐÐÐÐÑÐÐ Ð ÑÐÑÐÐÐÐ ÑÐÐÐÑÑÑÐÐÐ ÐÐÐÐ ÐÐÐÑÐÑÐÐÑÐÐ ÑÐÐÐÐÑÐÑ ÐÑÐÐÐÐÐÐÐÑÐÐÑÐÐÑÑÑ
+ÐÑÐÐÐÑÐÐÐ ÑÐÑÐ Tor.</p>
+
+<h2>Ð ÐÐÐÐÐÐÐ TOR</h2>
+
+<p>ÐÐÑÐÐÑÑÑ Ð ÐÐÐÑÐÐÐ, MA, ÐÑÐÐÐÑ Tor ÑÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐ
+ÐÐÐÑÐÐÑÐÐÐÐ Ñ ÐÑÐÑÑÑÑÐ ÐÐÐÐÐ, ÐÐÑÐÑÐÐ ÐÑÐÐÐÑÑÐÐÐÑÐÑ ÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐÑÑÑ
+ÐÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÑÐ. Tor ÑÐÐÑÐÑÑÑ ÑÐÐÑÐÑÑÐÑÐÐ ÑÐÐÐÐÑÑÐÐÐ
+ÑÐÐÐÑÑ Ñ ÐÐÐÐÑÐÑÐÑÐÐÐ ÐÐÐÐÐÐ-ÐÐÑÑÐÐÑ ÐÑÑÐÐÐÐÐÐÐÐÐ ÐÐÐ, ÐÐÑÐÐÑÐÐÑÑ Ð 2001Ð. Ð
+2006Ð. ÐÑÐÐÐÑ ÑÑÐÐ ÐÑÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐÐÐ ÐÐÐ. ÐÐÐÑÐÑ
+ÐÑÐÐÐÑ Tor ÑÐÐÐÑÐÐÑ Ñ ÑÐÑÑÐÑÐÐ ÐÐÑÐÐÐ, ÐÐÐ, ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ
+ÐÑÐÐÐÐÐÑÑÐÐÐ Ð ÐÐÐÐÐÑÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÑ, ÑÑÐÐÑ ÐÐÐÐÑÑ ÐÐ
+ÐÐÑÐÑÐÑÑ ÐÑ ÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐÑÑÑ.</p>
+
+<p>ÐÐÐÐÐÐ ÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÐÐÑÐÐÐÐÑ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÑ
+ÐÐÐÐÐÐÐÐÑÑÐ Tor Ð ÑÐÑÐ Tor, ÐÑÐÐÐÑ Tor ÑÐÐÐÐ ÐÐÐÐÐÐÐÑ ÐÑÑÐÐÐÐÐÐÑÐÐÑÐ Ð
+ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ, ÐÐÐ ÐÐÑÑÑÐÐÑÑ Ð ÐÐÐÐÑÐÑÑ ÐÐÑÑÑÐÐÐÑÑÐÐÑÐ Ð ÐÐÐÐÐÐÑÐÑÐ
+ÐÐÐÐÐÐÐÑÐ ÑÐÑÐ. ÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÐÐÑÑÐÐÐ Tor ÐÑÐÐÐÐÑÑÑ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÑ
+ÐÑÑÐÐÐÐÐÐÑÐÐÑÑÐÐÑ ÑÐÐÐÑ ÐÐ ÐÐÐÑÑÐÑ ÐÐÑÑÐÑÑ ÐÐÐÑÐÑÐÐÑÐÑÑ ÐÐ ÐÐÐÑÐÐÑÐÐÐÑ
+ÐÐÐÐÐÐÑÐÐÑÑÐ, Ð ÐÐÑÑÐ ÐÐÐÐÐÑ ÐÑÑÐÐÐÑ ÐÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐÑÐÐÑÐ ÐÐ
+ÑÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÑÑÑ ÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐ Ð Tor. Tor -
+ÑÑÐ ÑÐÐÐÐÑÐÑÑÐÐÐÑ ÐÑÐÐÐÑÐÐ ÐÑÐÐÐÐÐÐÑÐÑ, ÑÐÑÑÐÑÑÐÑ ÐÐ ÐÐÑÑÐÐ ÑÐÐÐÐÐÐ,
+ÑÐÐÐÑÐÑÑÐÑ ÑÐÐ ÐÐ ÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑÑ.</p>
+
+<p>ÐÐÐÐÑÐÐÑ "Onion Logo" Ð "Tor" ÑÐÐÑÑÑÑÑ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÐÐÑÐÐ ÑÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ
+ÐÑÐÐÐÑÐ Tor.</p>
+
+<p>ÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐ: ÐÐÐÑÑ ÐÑÑÐÐÐ</p>
+<p>ÐÐÐ: +1-781-424-9877</p>
+<p>ÐÐÐÐÑÑÐÐÐÐÑ ÐÐÑÑÐ: execdir@xxxxxxxxxxxxxx</p>
+<p><a href="https://www.torproject.org/";>ÐÐÐÑÐÐÑ: ÐÑÐÐÐÑ Tor</a></p>
+<div align=center>###</div>
+
+</div>
+
+
+#include <foot.wmi>

Added: website/trunk/press/ru/2010-03-25-tor-store-press-release.wml
===================================================================
--- website/trunk/press/ru/2010-03-25-tor-store-press-release.wml	                        (rev 0)
+++ website/trunk/press/ru/2010-03-25-tor-store-press-release.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+## translation metadata
+# Revision: $Revision: 22100 $
+# Translation-Priority: 4-optional
+#include "head.wmi" TITLE="TOR PROJECT AND PRINTFECTION ANNOUNCE THE TOR STORE" CHARSET="UTF-8"
+<div class="main-column">
+
+
+
+<!-- PUT CONTENT AFTER THIS TAG -->
+<h2>ÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ</h2>
+
+<h2><strong>ÐÐÐÐÐÐ TOR Ð PRINTFECTION ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ
+TOR</strong></h2>
+
+<p><strong>WALPOLE, MA</strong> ÐÑÐÐÐÑ Tor Ð ÐÐÐÐÐÐÐÑ Printfection ÐÑÐÑÑÐÐÑÑ <a
+href="http://printfection.com/torprojectstore";> ÐÐÐÐÐÐÐ Tor</a> ÐÐÑ ÐÑÐÑ
+ÐÐÐÐÐÐÐÐÐÐÐ Tor. ÐÐÐÐÐÐÐ Tor ÐÑÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐ Ð ÐÐÐÑÐÐÐ
+ÑÑÑÐÐÐÐÐ, ÐÑÑÐÐÐ Ð ÐÐÐÐÐ Ñ ÐÐÐÐÑÐÐÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÑÐÐÑÑ
+ÐÑÐÐÐÐÑÑ. ÐÐÑÐÑÑÐÐÐÐÑÐ ÐÑÐÑÐÑ ÐÐÑÐÐÐÐÑÑÑ ÐÑÐÐÑ ÐÑÐÐÑÐÑÐ. ÐÐÑÐÐÑ ÐÐÑÑÐÑ
+ÑÐÐÐÑÐÐ Ð ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑ ÐÐ ÐÐÐÑÐÑÑÑÐÑÑÑ ÐÐÐÐÐÐÑÑÐÐ ÑÐÑÐÑÐÐ ÑÐÐÐÑÐÐ Ñ
+ÐÐÐÐÑÐÐÐÐ Tor.</p>
+
+<p> <blockquote>"ÐÑÐÐÐÑ Tor ÐÑÐÐÐÑÐÑÐÑ ÑÐÑÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐ, ÐÑÐÐÐÐÐÐÐÐÑÑÑ
+ÐÐÐÐÐÐÐÐ Printfection, ÐÐÑ ÑÐÐÐ, ÑÑÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÐÑÑÐÐ ÐÐÐÐÑÐÑÑÐÐ
+ÑÑÐÑÐÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑ ÐÐÑÐÑÑ
+ÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐÑÑÐ. ÐÑ ÐÐÑÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐÐÐÐ Ñ ÑÐÐÐÐ ÐÐÐÐÑÐ ÐÑÐÐÐÑÐÐ."
+</blockquote>
+ - ÑÐÐÐÐÐ ÐÑÐÐÐÐÐÑÐÐÑÐÑÐ ÐÐÑÐÐÑÐÑ Printfection ÐÑÐÑÐ ÐÐÑ</p>
+
+<p>ÐÐÑÑÑÑÐÐÐÑÑ Ð ÑÐÑÐÐÐÐÐÐÐ Tor ÑÐÐ ÐÑÐÐÐÑÐÑÑÑÑÑ ÑÐÑÐÑÐÐ ÑÑÑÑÑ ÐÑÐÐÐ ÐÐÑ ÐÐÑÐÑÑ
+ÐÑ ÐÐÑÑÐÐÑÐÐÑÑÐ ÐÐÐÐÐÐ. ÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÑÑÐÑÑ Ð ÑÐÐÑ ÐÑÑÐÐÐÐÑÑÐÐ Ð
+ÐÐÑÐÑÐÐÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÐ, ÐÐÑÐÑÑÐÑÑÑ Ñ ÐÑÐÐÐÐÐÑÐÐÐÐ Ð ÐÐÑÑÐÐÐÐÑÐÐÐ Ð ÑÑÑÐÐÐÑ
+Ñ ÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐÑÐÐÐ ÑÐÐÐÐÐÐ. ÐÑÐÐÐÑÐÑÑ Tor, ÐÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÑÑÐÐÐ
+ÑÐÑÑÐÐÑÑÑ ÐÐÐÐÐÐÐÐÑÑÑ ÐÑÐ ÐÐÐÑÐÑÐÑÑ Ð ÐÐÑÐÑÐÐÑÐ, ÑÐÐÐÐ ÐÐÐ Ð ÐÑÐÐ, ÐÐÑÐÑÑÐ
+ÐÐÑÑÑ ÑÐÑÐÐÐÑÐÐ ÑÑÐÑÑÐÐÑÐÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÑÐÑ (ÐÐÐÑÐÐÐÑ, ÐÐÑÑÐÑ
+ÐÐÐÐÑÐÐÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÐÑÐÐÑÑÑÐ) Ð ÑÑÑÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐÐÑÐÐ. ÐÐÑÑ Tor ÑÐÐÐÐ
+ÐÑÐÐÐÑÑÐÐÐÑÐÑ ÐÐÑÐÑÑ ÐÑÐÑÐ, ÐÐÑÐÑÑÐ ÐÑÑÑ ÐÑÑÐÐÐÐ ÑÑÐÐÐÑ ÑÐÐÑÐÑÐÐÑÑÐ ÐÐ
+ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐ Ð ISP, ÑÐÐÐÑÐÑÑÐÑ ÑÐÑÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐÐÑÑÐÑ ÐÐ ÐÑ
+ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐ.</p>
+
+<p>Tor ÐÑÐÐÐÐÑÐÐÑ ÐÐÑ ÐÐÐÐÐÑÐÐÑÑ ÐÑÐÐÐÑ, ÐÐÐÑÐÐÑ ÑÐÐÐÑÑ Ñ ÐÐÐÐÑÐÐÐÐ Tor, Ð
+ÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐÑÑÑÑ Ð ÑÑÑÑÑÐÐ ÐÑÐÐÐ, ÐÐÑÐÑÑÐ ÐÐÐÑÑÑ ÐÐÐÐÑÑÐÐÐÐÐÐÑ, ÐÐÐÑÐÑÑÑÑ
+ÐÐÑÐÐÐ <a href="<page donate>">ÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐÐÐÐÑ ÐÐÐÐÐÐÑÑ ÑÑÐÐÑÑÐ</a>.  </p>
+
+<h2>Ð ÐÐÐÐÐÐÐ TOR</h2>
+
+<p>ÐÐÑÐÐÑÑÑ Ð ÐÐÐÐÐÐÐ, MA, ÐÑÐÐÐÑ Tor ÑÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐ
+ÐÐÐÑÐÐÑÐÐÐÐ Ñ ÐÑÐÑÑÑÑÐ ÐÐÐÐÐ, ÐÐÑÐÑÐÐ ÐÑÐÐÐÑÑÐÐÐÑÐÑ ÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐÑÑÑ
+ÐÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÑÐ. Tor ÑÐÐÑÐÑÑÑ ÑÐÐÑÐÑÑÐÑÐÐ ÑÐÐÐÐÑÑÐÐÐ
+ÑÐÐÐÑÑ Ñ ÐÐÐÐÑÐÑÐÑÐÐÐ ÐÐÐÐÐÐ-ÐÐÑÑÐÐÑ ÐÑÑÐÐÐÐÐÐÐÐÐ ÐÐÐ, ÐÐÑÐÐÑÐÐÑÑ Ð 2001Ð. Ð
+2006Ð. ÐÑÐÐÐÑ ÑÑÐÐ ÐÑÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐÐÐ ÐÐÐ. ÐÐÐÑÐÑ
+ÐÑÐÐÐÑ Tor ÑÐÐÐÑÐÐÑ Ñ ÑÐÑÑÐÑÐÐ ÐÐÑÐÐÐ, ÐÐÐ, ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ
+ÐÑÐÐÐÐÐÑÑÐÐÐ Ð ÐÐÐÐÐÑÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÑ, ÑÑÐÐÑ ÐÐÐÐÑÑ ÐÐ
+ÐÐÑÐÑÐÑÑ ÐÑ ÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐÑÑÑ.</p>
+
+<p>ÐÐÐÐÐÐ ÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÐÐÑÐÐÐÐÑ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÑ
+ÐÐÐÐÐÐÐÐÑÑÐ Tor Ð ÑÐÑÐ Tor, ÐÑÐÐÐÑ Tor ÑÐÐÐÐ ÐÐÐÐÐÐÐÑ ÐÑÑÐÐÐÐÐÐÑÐÐÑÐ Ð
+ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ, ÐÐÐ ÐÐÑÑÑÐÐÑÑ Ð ÐÐÐÐÑÐÑÑ ÐÐÑÑÑÐÐÐÑÑÐÐÑÐ Ð ÐÐÐÐÐÐÑÐÑÐ
+ÐÐÐÐÐÐÐÑÐ ÑÐÑÐ. ÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÐÐÑÑÐÐÐ Tor ÐÑÐÐÐÐÑÑÑ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÑ
+ÐÑÑÐÐÐÐÐÐÑÐÐÑÑÐÐÑ ÑÐÐÐÑ ÐÐ ÐÐÐÑÑÐÑ ÐÐÑÑÐÑÑ ÐÐÐÑÐÑÐÐÑÐÑÑ ÐÐ ÐÐÐÑÐÐÑÐÐÐÑ
+ÐÐÐÐÐÐÑÐÐÑÑÐ, Ð ÐÐÑÑÐ ÐÐÐÐÐÑ ÐÑÑÐÐÐÑ ÐÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ ÐÐ
+ÑÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÑÑÑ ÐÐÐ ÐÐÐÑÐÐÐÑÐ, ÐÐÐÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐ Ð Tor. Tor -
+ÑÑÐ ÑÐÐÐÐÑÐÑÑÐÐÐÑ ÐÑÐÐÐÑÐÐ ÐÑÐÐÐÐÐÐÑÐÑ, ÑÐÑÑÐÑÑÐÑ ÐÐ ÐÐÑÑÐÐ ÑÐÐÐÐÐÐ,
+ÑÐÐÐÑÐÑÑÐÑ ÑÐÐ ÐÐ ÐÐÐÐÑÑ ÐÐÐÑÑÐÑÑÑ.</p>
+
+<h2>Ð ÐÐÐÐÐÐÐÐ PRINTFECTION</h2>
+
+<p>Printfection  ÑÐÐÑÐÑÑÑ ÐÐÐÐÑÑÑÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐ ÐÐ
+ÑÑÐÐÐ. ÐÐÑÑÑÐÐ ÑÑÑÑÑ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÑÑÑ ÐÐÑÐ ÑÐÑÐÐÐÐÐÐÐ Ð ÑÑÐÑÐÐ ÐÐÑ
+ÑÑÐÐÐÐÐÑ ÑÐÐÐÑ ÐÑÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐ. ÐÐÑ ÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐÐ ÐÑ
+ÐÐÐÐÐ ÑÐÑÐÑÑÐÑÑ ÐÑÐÑÐÑÑ ÐÑÐÐÐÐÐ ÐÑ ÐÐÐÐ, ÐÑÑÐÐÐ Ð ÐÑÑÐÐÑ ÑÐÐÐÑÐÐ ÐÐÑ
+ÐÑÐÐÐÑÑÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÑÑÐÐÐ ÐÑÐÐÐÐÐ ÑÐÐÐÑÐÐ ÐÐÐÐÐÐ. ÐÑÐÑÑÐ ÐÐ ÑÑÐÐÐ Ñ
+2004Ð., Printfection ÐÑÐÐÐÑÑÐÐÐÑÐÑ ÑÐÑÑÐÐÐ ÐÐÐÐÐ 20 000 ÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐÐ,
+ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÑ ÑÑÐÑ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÐÑ. ÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÑÑÑ
+Ð ÐÐÐÐÐÑÐ, ÑÑÐÑ ÐÐÐÐÑÐÐÐ. ÐÐÐÐÐÑÐ ÐÐÐÑÑÐ Ð ÐÐÐÐÐÐÐÐ Printfection ÐÐ ÑÐÐÑÐ
+www.Printfection.com.</p>
+
+<p>ÐÐÐÐÑÐÐÑ "Onion Logo" Ð "Tor" ÑÐÐÑÑÑÑÑ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÐÐÑÐÐ ÑÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ
+ÐÑÐÐÐÑÐ Tor.</p>
+
+<p>ÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐ: ÐÐÐÑÑ ÐÑÑÐÑÐ</p>
+<p>ÐÐÐ: +1-781-424-9877</p>
+<p>ÐÐÐÐÑÑÐÐÐÐÑ ÐÐÑÑÐ: execdir@xxxxxxxxxxxxxx</p>
+<p><a href="https://www.torproject.org/";>ÐÐÐÑÐÐÑ: ÐÑÐÐÐÑ Tor</a></p>
+<div align=center>###</div>
+
+</div>
+
+
+#include <foot.wmi>

Modified: website/trunk/ru/bridges.wml
===================================================================
--- website/trunk/ru/bridges.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -39,19 +39,16 @@
 </p>
 
 <p>
-ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÑÐÑ ÑÐÐÑ, ÑÑÐ ÑÑÑÐÑÑÐÑÑÑ Ð ÐÑÑÐÐÐ ÐÑÐÑÐÐÑ, ÐÐ ÐÐÑÐÑÑÐ
-Tor ÐÐÐÐÑ ÐÐ ÑÐÐÐÑÐÑÑ. Ð ÑÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ <a href="<page
-torbrowser/index>">The Tor Browser Bundle</a> ÐÐÑ ÐÐÐÑÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÑ
-Windows ÐÑÑÑ ÑÑÐÐÑÐÑ ÐÐÐÑÐÐÐÐÐ, ÐÐÑÐÑÐÑ ÐÑÐÐÐÐÐÐÐÑÐÐÐ ÐÐÑ ÐÐÑÐÐÑÐÐÐ
-ÐÐÐÐÐÐÑÑÐÐÐ Ð ÐÑÐÑÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐÑ. ÐÑÐÐ ÐÑ ÐÑÐÑÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑ Ñ
-ÐÐÑÑÑÐÐÐÐÐ ÐÑÐÐÑÐÐÐÑ Tor, ÐÑ ÑÐÐÐÐ ÑÐÐÐÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÑÑ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#IinstalledTorandPolipobutitsnotworking.";>ÐÐÐÑÐÐ
-ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ (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="<wiki>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>
@@ -162,9 +159,9 @@
 docs/tor-doc-relay>">ÑÑÐÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÑÐÑÑÐÑ Tor</a>, ÐÐÐ ÑÑÐÐÑ ÐÐÑÑÑÐÐÑÑ
 ÑÐÑÑÐÐÑÐÑÑÐÑ ÑÐÐÐ ÐÐÑÑ. ÐÐÑÑÑÐÐÑÑ ÐÐÐ ÐÐÐÐÐ ÑÐÐÐÑÑÑÐÐÐ ÑÐÐÑÐÐÐÐÐ:
 <ul>
-<li> ÐÑÑÑÐÑÑ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>ÐÑÑÐÐÐÐÑÐÑÐÐÐÐ
-ÐÐÑ torrc  ÑÐÐÐ</a>, ÑÑÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÑÐÐÑÐÐ ÑÑÐ ÑÐÑÑÑÐ ÐÐÐÐÐ:<br />
+<li> manually <a
+href="<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit your torrc
+file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -177,11 +174,10 @@
 </ul>
 </p>
 
-<p>ÐÑÐÐ ÐÑ ÐÐÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐ "ÐÐ ÐÐÐÑ ÑÐÑÐÐÑÑÑÑ Ñ 0.0.0.0:443: Ð
-ÑÐÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐ" ÐÑÐ ÐÐÐÑÑÐÐ, ÐÐÐ ÐÑÐÐÐ ÐÑÐÑÐÑÑ ÐÐÐÐÐ ÐÑÑÐÐÐÐ ORPort
-(ÐÐÐÑÐÐÐÑ, 8080) ÐÐÐ ÑÑÑÐÐÐÐÐÑÑ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Myfirewallonlyallowsafewoutgoingports.";>ÐÐÐÐÐÐÐÑÐÑÑ
-ÐÐÑÐÐÐÑÐÑÐÑÐÑ ÐÐÑÑÐÐ</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="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/ru/contact.wml
===================================================================
--- website/trunk/ru/contact.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/contact.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -40,11 +40,10 @@
 <li><tt>tor-ops</tt> ÑÑÐ ÐÑÐÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑÑÑÑ ÑÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÐ.  ÐÐÑÐÑÐ
 ÑÑÐÐ ÐÑÐÐ ÐÑ ÐÐÐÑÑÑÐÐÐ ÑÐÑÐÐÑ Tor Ð Ñ ÐÐÑ ÐÑÑÑ ÐÐÐÑÐÑ ÐÐÐ ÐÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐ
 ÑÐÑÐÐÑÐÐ.</li>
-<li><tt>tor-webmaster</tt> ÐÐÐÐÑ ÐÑÐÑÐÐÐÑÑ ÐÐÐÑÐÑÐÐ ÐÐ ÑÐÐÑÐ, ÐÑÑÐÐÐÐÑÐÑÐÐÐÑÑ
-ÐÐÐÐÑÐÑÐ ÑÑÐÐÑÐÐÐÐÐÑ ÐÐÐ ÑÐÐÐÑÑ ÐÐ ÑÐÐÑÐ, ÐÐÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐ
-ÐÐÑÐÐÑÐÑÑ ÐÐÑÐÑÑÐ ÐÑ ÐÑÐÑÐÑÑÐ. ÐÑ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÑÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐ
-ÑÐÐÑÐÐ ÐÐ <a href="https://trac.torproject.org/projects/tor/wiki";>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="<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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/documentation.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -40,40 +40,35 @@
 </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="<wiki>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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean";>ÑÐÐÐÐ
-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="<wiki>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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#MyTorkeepscrashing.";>ÐÐÐ
-ÑÐÐÐÑÐÑÑ Ð ÐÐÐÐÑ 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="<wiki>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>
-<a href="https://blog.torproject.org/";>ÐÐÐÐ ÐÑÐÐÐÑÐ Tor</a>. ÐÑ ÑÑÐÑÐÐÐÑÑ
-ÐÑÐÐÐÐÐÐÐÑÑ ÑÐÐÐÐÐ ÐÐÐÐÑÑÐ ÑÐÐ Ð ÐÐÐÑ, ÐÐÐ ÐÐÐÐÐÐ. 
+<a href="<blog>">Tor has a blog now</a>.  We try to keep it updated every
+week or two with the latest news.
 </li>
 
 <li>
@@ -229,8 +224,8 @@
 ÐÑÐÑÐÐÐÐÐ SOCKS Ð ÑÐÑÑÐÑÐÐÐÐ</a></li>
 <li><a href="<svnsandbox>doc/spec/version-spec.txt">ÐÐÐ ÑÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐ
 ÐÐÑÑÐÐ Tor</a></li>
-<li><a href="<svnsandbox>doc/spec/proposals/">ÐÐÑÐÐÐÑÑÐÐÐÐÑÐ ÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑ
-ÐÐÐÑÑ ÑÐÑÐÐÑÐÑÐÑÑÐÐ Ð ÐÑÐÐÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐ</a></li>
+<li><a href="<gittree>doc/spec/proposals">In-progress drafts of new
+specifications and proposed changes</a></li>
 </ul></li>
 
 </ul>
@@ -238,13 +233,10 @@
 <a id="NeatLinks"></a>
 <h2><a class="anchor" href="#NeatLinks">ÐÐÐÐÐÐÑÐ ÑÑÑÐÐÐ</a></h2>
 <ul>
-<li>ÐÐÐÐÐÑÑÐÐ ÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÐ ÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ Tor ÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki";>Tor
-wiki</a>. ÐÐÐÐÐÐÐÑÑÐÑÑ!</li>
-<li><a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>ÐÐÐÑÐÐ
-ÐÐÐÐÐÑÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐ, ÐÐÑÐÑÑÐ ÐÑ, ÐÐÐÐÐÐÐÐ, ÐÐÑÐÑÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ Ñ
-Tor</a>.</li>
+<li>The <a href="<wiki>">Tor wiki</a> provides a plethora of helpful
+contributions from Tor users. Check it out!</li>
+<li><a href="<wiki>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> ÐÐÐÐÐÑÑ ÐÐÐ
 ÐÐÑÐÐÐÐÐÑÑ, ÐÑÐÐÐÑÐÑÐÑÐ ÐÐ ÐÑ Tor ÐÐÐ ÐÐÑ.</li>

Modified: website/trunk/ru/download-unix.wml
===================================================================
--- website/trunk/ru/download-unix.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/download-unix.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -73,8 +73,7 @@
 <td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; ÑÑÑÐÐÐÐÐÐ</kbd></td>
 <td>
 <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a><br /> <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/OpenbsdChrootedTor";>ÐÐÑÑÑÑÐÑÐÑ
-ÐÐ ÐÑÐÑÐÑÑÑ ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐ Tor Ð OpenBSD</a>
+href="<wiki>OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>
 </td>
 </tr>
 
@@ -236,14 +235,12 @@
 </li>
 
 <li>
-Tor ÑÐÐÐÑÐÑ ÐÐÑÐÐÐ, ÐÐÑÐÐÐÐÑÑÑÐÐ ÐÑÐÐÑÑÐÐÐÐÐÐÐ ÐÐÑÐÐÐ ÑÑÐÑÐÐÐ, Ð ÑÐÐÐÐ
-ÑÐÑÑÑÐÑ ÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ ÐÐÑÑÑÐ ÑÐÑÐ Tor, ÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#ExitEavesdroppers";>ÐÐ
-ÐÐ ÐÐÐÐÑ ÑÐÑÑÐÐÐÑÑ ÐÐÑ ÑÑÐÑÐÐ ÐÐÐÐÑ ÑÐÑÑÑ Tor Ð ÐÐ ÐÐÐÐÑÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐ
-ÐÐÐÐÐÑÐÐÐÑ. </a> ÐÑÐÐ ÐÑ ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ, ÑÐ ÐÐÐÐÐÑ
-ÐÑÑÑ ÑÐÐÐÐ ÐÑÑÐÑÐÐÐÑ, ÐÐÐ ÐÑÐÐ ÐÑ ÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÐÐ
-ÐÐÑÐÑÐÐÑ ÑÐÐÐÐÐÐÐÐÐ; ÐÑÐÐÐÑÐÑÐÑÐ HTTPS ÐÐÐ ÐÑÑÐÐÐ ÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÐ Ð
-ÐÑÑÐÐÑÐÑÐÐÐÑÐÑ.
+Tor anonymizes the origin of your traffic, and it encrypts everything inside
+the Tor network, but <a href="<wiki>TorFAQ#ExitEavesdroppers">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/download.wml
===================================================================
--- website/trunk/ru/download.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -256,14 +256,13 @@
 </li>
 
 <li>
-ÐÐÑÐÐÑ Tor ÐÐÐÐÐÐÐÐÐÑÑÐÑ ÐÑÐÐÑÑÐÐÐÐÐÐÐ ÐÐÑÐÐÐ ÑÑÐÑÐÐÐ Ð ÐÐÐÐÑÑÐÑ
-ÐÐÑÐÑÐÐÑÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑ ÐÐÐÐ Ð ÑÐÑÑÑ Tor, Ð ÑÐÐÐÐ ÐÐÑÑÑÐ ÑÐÑÐ Tor, ÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#SoImtotallyanonymousifIuseTor";>ÐÐ
-ÐÐ ÐÐÐÐÑ ÐÐÑÐÑÑÐÐÐÑÑ ÐÐÑ ÑÑÐÑÐÐ ÐÐÐÐÑ ÑÐÑÑÑ 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="<wiki>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-abuse.wml
===================================================================
--- website/trunk/ru/faq-abuse.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/faq-abuse.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -278,13 +278,11 @@
 ÐÐÐÑÐÑÐÑÐÐ ÐÐ #tor ÐÐ irc.oftc.net Ð ÐÐÐ, Ð ÐÐÐÑÐ ÐÐÐÑÐÐ, ÐÐÐÐÑÑ, ÑÑÐ ÐÐ ÐÑÐ
 ÐÑ ÑÐÐÑÐÐÑÑ ÐÑÑÐÐÑÐÐ ÐÐÐ. </p>
 
-<p>Ð ÐÐÐÐÑÑÐÐÐÐ, ÐÑÐÐ ÐÑ ÑÐÐÐÐÐ Ð IRC ÑÐÑÐ, ÐÐÑÐÑÐÑ ÐÐÐÐÐÑÑÐÑ Tor, ÐÐÐ
-ÐÑÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÑÐÐÐ ÐÐÑÐÐ ÑÐÑÐ, ÐÐÐÐÐÑÐÑÑÐ, ÐÐÐÐÑÑÐÑÐ ÑÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð
-<a
-href="https://wiki.torproject.org/wiki/TheOnionRouter/BlockingIrc";>ÑÐÑÑÐÐÑ
-ÐÑÑÐÐÐÐÐÐÐÐÑ IRC ÐÐÐÐÐÑÐÐÐÐ</a> Ñ ÑÐÐ, ÑÑÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐÑÑÑÑ
-ÐÑÑÐÐÐ. ÐÐÑÑ ÐÑ ÐÐÐÐ IRC ÑÐÑÑ Ð ÐÑÐÐÐ ÑÐÐÐÐÐÐÐÑÑÐÑ ÐÑÐÐÐÐÑÐ ÑÐÐÑ, ÐÑÐÐÐÐÐ,
-ÑÑÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐ ÐÑÐÐÐÑÐÑÐ. </p>
+<p>Finally, if you become aware of an IRC network that seems to be blocking
+Tor, or a single Tor exit node, please put that information on <a
+href="<wiki>BlockingIrc">The Tor IRC block tracker</a> so that others can
+share.  At least one IRC network consults that page to unblock exit nodes
+that have been blocked inadvertently. </p>
 
 <a id="SMTPBans"></a>
 <h3><a class="anchor" href="#SMTPBans">ÐÐÑÐ ÑÐÐÑ ÐÐÐÐÐÐÐÑÐÐÐÐÑ ÐÐÑÑÐÐÑÐ

Modified: website/trunk/ru/faq.wml
===================================================================
--- website/trunk/ru/faq.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/faq.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -89,10 +89,8 @@
 ÐÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐ?</a></li>
 </ul>
 
-<p>ÐÐ ÐÑÐÐ ÐÑÑÐÐÐ ÐÐÐÑÐÑÐÐ, ÐÐ ÐÑÑÐÐÐÐÐÑÐ Ð ÑÑÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ
-ÐÐÐÑÐÑÐÐ (FAQ), ÐÐÐÐÐÑÐÑÑÐ, ÐÐÑÐÑÐÑÐÑÑ Ð <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ";>ÐÐÑÐÑÐÐÐÐÐ
-wiki FAQ</a>.</p>
+<p>For other questions not yet on this version of the FAQ, see the <a
+href="<wiki>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>
@@ -210,16 +208,13 @@
 </p>
 
 <p>
-ÐÑÑÐÑÑÐÑÐÑ ÐÐÑÑÐ ÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐ, ÐÐÑÐÑÑÐ ÐÑ ÐÐÐÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ Ñ Tor, ÐÐ
-ÐÑ ÐÐ ÐÑÑÐÐÐÐÐÐÐÐ ÐÐÐÑÐÑÑ ÐÐÐÐÐÐÐÐÑÑÐ ÑÑÐÐÐÑ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑ ÐÐÑ Ð
-ÐÐÑÑÐÑÐÑÐÐÐ ÐÐÑÐ, ÑÑÐÐÑ ÑÐÐÐÐÐÐÐÐÐÐÑÑ ÐÑ  ÐÐÐÐÐÐÑÐÑÑ ÐÐÐÑÐÐÑÑÐÑÐÑ. ÐÐÑÐ
-ÑÑÑÐÐÐÑÐÐ ÐÐÐÐ ÑÐÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÐÑÑÑÑÐÑÐÐ ÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO";>ÂÐÐÑÐÑÐÐÐÑÐÐÂ
-ÐÐÐÐÑÐÑÑÑ ÐÑÐÐÐÐÐÐÐÐ</a>. ÐÑÑÑ ÑÐÐ ÑÐÐÐÐ Ð <a
-href="https://trac.torproject.org/projects/tor/wiki/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="<wiki>TorifyHOWTO">Torifying specific applications</a>. There's
+also a <a href="<wiki>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>
@@ -421,9 +416,9 @@
 </p>
 
 <p>
-ÐÐÑ ÐÐÐÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐ, ÑÐÐÑÑÐÑÐ <a
-href="https://blog.torproject.org/blog/why-tor-is-slow";> ÐÐÐÐ ÐÐÐÐÐÑÐ ÐÐ ÑÑÑ
-ÑÐÐÑ</a>, ÐÐÑÐÑÑÐ ÐÐÐÑÑÐÐÑ ÐÐÐÑÐÐÐÑÐ PDF Ð ÐÐÐÐÐ.
+For the much more in-depth answer, see <a
+href="<blog>why-tor-is-slow">Roger's blog post on the topic</a>, which
+includes both a detailed PDF and a video to go with it.
 </p>
 
 <p>
@@ -453,16 +448,13 @@
 </li>
 
 <li>
-ÐÑÑÐÑÑÐÑÐÑ ÐÐÑÐÐÐÑÐÐ ÑÐÐÐÐ, ÐÐÑÑÑÐÐÑÑ ÐÐÐÐÐÐÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐÑÐ, ÐÐÑÐÑÑÐ
-ÐÐÐÑÑ ÑÐÑÑÑÐÑÑ ÐÑÐÐÐÐÐÐÐÑÐÐÑÐÐÑÑÑ Tor. <a
-href="https://trac.torproject.org/projects/tor/wiki/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="<wiki>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>
@@ -828,19 +820,17 @@
 ÐÑÐÑÐÑÑ Tor. ÐÐÑÐÐ ÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐÑÐÑÑ Vidalia ÐÐÑ ÐÐÑÐÐÐÐÑÑÐÐ Tor Ð ÐÑÐ
 ÑÐÐÐÐ ÐÐÑÐÐÐÑÐÐÑ.
 </li>
-<li>ÐÐÐÐÐ ÐÑ ÐÐÑÑÑÐÐÐÐ Tor ÐÐ ÑÐÐÐÑÑ Ð ÐÐÑÐÑÑÐÐ ÑÐÑÐÐÑÐ Windows NT. ÐÐÐÐÐ Tor
-ÐÐÑÑÑÐÐÐ ÐÐ ÑÐÐÐÑÑ Ð ÐÐÑÐÑÑÐÐ ÑÐÑÐÐÑÐ, ÐÐ ÐÐÐÑÑÐÐÐÑÑÑ ÐÑÐ ÐÐÐÑÑÐÐÐ
-ÑÐÑÑÐÐÑ. ÐÑÐÐ ÐÑ ÐÐÑÑÑÐÐÐÐ Tor ÐÐ ÐÐÐÑÑÐ Ð ÐÐÑÐÑÑÐÐ ÑÐÑÐÐÑÐ ÑÐÑÐÐ Vidalia,
-ÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑ ÐÑÐ ÑÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÐ Ð Tor. ÐÑÐ ÐÐÑÐÐÐÐÑÑÐÐ ÐÐÐÐÑÑÑÐÑÐ,
-Tor ÐÐÐÑÑÐÐÑÑÑ Ð ÐÑÐÐÐÑÐÑÐÑ ÑÐÑÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑ. ÐÑ ÐÑÐÐÐÑÐ Ð
-ÐÐÐÑÑÐÐÐÑÐ Vidalia. Vidalia ÐÑÐÐÐÐÑÐÑ ÐÐÐÑÑÐÑ ÐÐÐÐÑÐÐÐÐÑÐÐ Ñ ÑÐÐ ÑÐÐÐÑÐÑÑÐÐ
-Tor. Vidalia ÐÐÐÐÑÐÑÑÐÑ ÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑ, ÐÐ ÐÐ ÐÑÐÐÑÐÐÑÑÑ ÐÑ ÐÐÑÐÐÑ
-ÑÐÑÑÐÐÐÐÐÐÐÐ Ð ÑÐÑÐÐÑÐ Tor. <br /> ÐÐÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑÑÑÐÐÑÑ Tor, ÑÑÐÐÑ
-ÐÐ ÐÐ ÑÐÐÐÑÐÐ Ð ÐÐÑÐÑÑÐÐ ÑÐÑÐÐÑÐ. ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐÐÑÐÐÐÑÐ ÑÑÐÐÐ ÑÐÐÑÐÐ
-ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ (FAQ) <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#HowdoIrunmyTorrelayasanNTservice";>ÑÐÐÐÑÐ
-Tor Ð ÐÐÑÐÑÑÐÐ ÑÐÑÐÐÑÐ Windows NT</a> ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐ ÐÐÑÐÐÑÐÐÐ
-ÐÐÑÐÑÐÐÑÐÐ Ð ÑÐÐ, ÐÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÐÑ Tor.
+<li>You had previously set Tor to run as a Windows NT service. When Tor is set
+to run as a service, it starts up when the system boots. If you configured
+Tor to start as a service through Vidalia, a random password was set and
+saved in Tor. When you reboot, Tor starts up and uses the random password it
+saved. You login and start up Vidalia. Vidalia attempts to talk to the
+already running Tor. Vidalia generates a random password, but it is
+different than the saved password in the Tor service.  <br /> You need to
+reconfigure Tor to not be a service. See the FAQ entry on <a
+href="<wiki>TorFAQ#HowdoIrunmyTorrelayasanNTservice">running Tor as a
+Windows NT service</a> for more information on how to remove the Tor
+service.
 </li>
 </ol>
 
@@ -880,15 +870,13 @@
 ÐÐÐÐÐÑÑÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐ.
 </p>
 <p>
-ÐÐÑÐÐ ÐÐÐÑÐÐÑÑÐÑÐÐ ÐÑÐÐÐÑÑ Ð ÐÑÐÐÐÐÑÑ ÑÐÐÐÐ (<tt>EntryNodes</tt> Ð
-<tt>ExitNodes</tt>) ÐÐÑÐÑÐÐÐÐÐÑÑÑÑ ÐÐÐ ÐÐÐÑÐÑÑ. ÐÑÐ ÐÐÐÐÑÐÐÑ, ÑÑÐ ÐÑÐÐ ÑÐÐÑ
-ÐÐÐÐÑÑÑÐÐÑ ÐÐÐ ÑÐÐÐÑÐÑÑ ÐÐÐÐÐÐÐÐ, ÑÐÑÑÐÐÐ Tor ÐÑÐÐÑ ÐÑ ÐÐÐÐÐÐÑÑ. ÐÑ ÐÐÐÐÑÐ
-ÑÐÐÐÐÑÑ ÑÑÑ ÐÐÑÐÑ ÐÐÑÐÐÑÐÐÑÐÐÐ, ÑÑÑÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐ 1 Ð ÐÐÐÐ
-<tt>StrictExitNodes</tt> ÐÐÐ <tt>StrictEntryNodes</tt>. ÐÐ ÐÑÐÐ ÐÑ ÑÐÐÐÐÐÑÐ
-ÑÐÐ, ÐÐÑÐ ÑÐÐÐÐÐÐÐÐÑ Tor ÐÑÐÐÑÐÑÑÑ ÑÐÐÐÑÑ, ÐÑÐÐ ÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐÐÐÐÑÑ ÐÐÐÐ
-ÑÐÐÐÐ ÑÑÐÐÑÑ ÐÐÐÐÑÑÑÐÐÑÐÐ. ÐÑÐÑÐÐÑÑÐÑÐ <a
-href="https://www.torproject.org/documentation.html.en#NeatLinks";>ÑÑÑÐÐÐÑÑ
-ÑÑÐÑÑÑÐÐ Tor</a> ÐÐÑ ÐÑÐÐÑÐ ÑÐÐÐÐ.
+The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as
+a request, meaning if the nodes are down or seem slow, Tor will still avoid
+them.  You can make the option mandatory by setting <tt>StrictExitNodes
+1</tt> or <tt>StrictEntryNodes 1</tt> &mdash; but if you do, your Tor
+connections will stop working if all of the nodes you have specified become
+unreachable.  See the <a href="<page documentation>#NeatLinks">Tor status
+pages</a> for some nodes you might pick.
 </p>
 <p>
 ÐÐÐÑÑÐ ÑÑÐÐÐ ÐÑ ÐÐÐÐÑÐ Ð ÐÐÐÐ <tt>$fingerprint</tt> ÐÐÐÐÐÐÑÐÑÑ ÐÐÑÑÐÑÐÐÐÐÐÑÐ
@@ -914,13 +902,10 @@
 </p>
 
 <ul>
-<li>ÐÐÐÐÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐÐ Tor ÐÐÐÐÑ ÐÑÑÑÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÑ ÐÐÑ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#LimitBandwidth";>ÐÐÑÐÐÐÑÐÐÐÑ
-ÑÐÐÑÐÑÑÐ</a>. ÐÐÐÐÐ ÑÐÐÐ, ÐÑÐÐ ÐÑ ÐÐÐÐÑÐ ÑÐÐÑÐÑÑÐÐÐ ÐÐÐÐÐÑÑÐÐÐÐ, ÐÐ ÑÐÑÐÑÐ
-ÐÐÑÐÐÐÑÐÑÑ ÑÐÑÐÐ ÐÐÐÑÐÐ ÐÑÐÐÑÑÐÐÐÐÑÑ ÑÐÑÐÐ ÐÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑ Ð ÐÐÐÑ (ÐÐÐÐÐÑ
-ÐÐÐ ÐÐÑÑÑ), ÐÐÑÐÑÐÑÐÑÑ Ð <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Hibernation";>ÑÑÐÐÑÐÐ
-ÐÐÐÐÑÐÐÑÐÐ</a>.
+<li>Tor has built-in support for <a href="<wiki>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="<wiki>TorFAQ#Hibernation">hibernation feature</a>.
 </li>
 <li>ÐÐÐÐÑÐ ÑÐÑÑÐÐÑÐÑÑÐÑ Tor ÐÐÐÐÑ <a href="#ExitPolicies">ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ</a>,
 ÐÐÑÐÑÑÐ ÑÑÑÐÐÐÐÐÐÐÐÑÑ ÑÐÐÑÐÑÐÐÐÑÐ Ð ÐÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐÐÐÑ ÑÑÐÐÐ
@@ -937,13 +922,11 @@
 ÑÐÐÐÑ ÑÐÑÑÐÑÑ ÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÐ ÐÑÐÑÑÐ ÐÑÑÐÐÐÑÑÑ Address config ÐÑÑÑÑÐ, Ð
 Tor ÐÐÐÑÑÐÐÑÑÑ ÐÐÑÐÐÐÐÐÑÑ ÐÐÑÐÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐ.
 </li>
-<li>ÐÑÐÐ ÐÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑ ÑÐÐÐÑÐÐÑ ÑÐÑÐÐ ÐÑÐÑÐÐÐÐ NAT (ÐÑÐÑÐÐÐÐ ÑÑÐÐÑÐÑÑÐÐ
-ÑÐÑÐÐÑÑ ÐÐÑÐÑÐÐ) Ð ÐÑÐÐÐÑÐÑÐ IP ÐÐ ÐÐÐÐÑÑÐÐ (ÐÐÐÑÐÐÐÑ, ÐÑÐÐ IP ÐÐÑÐÑ -
-192.168.x.y), ÐÐÐ ÐÐÐÐÐÐÐÐÑÑÑ ÑÑÑÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÑ ÐÐÑÑÐÐ. ÐÐÑÐÐÐÑÐÑÐÑÐÑ
-ÑÐÐÐÐÐÐÐÐÐ TCP ÐÐÐÐÑ ÑÐÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐÐÑÑÐ, ÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#ServerForFirewalledClients";>ÑÑÐÑ
-ÑÐÐÑÐÐ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ (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="<wiki>TorFAQ#ServerForFirewalledClients">this FAQ entry</a> offers
+some examples on how to do this.
 </li>
 <li>ÐÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑ ÐÑÐÐÑ ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐÑÑ, Ð ÐÐÑÐÐÐÐÐÑÑ ÐÐÑÐÑÐÐÑÐÑ Ð ÑÐÐÐÐ
 ÑÐÐÑÑÐÐ ÐÐÑÐÐÑÐÐÐÐ ÐÐÐÐÑÑ ÐÑÐÐÑÑÐÐÐÐÑ, ÑÐÐÐÐ ÐÐÑÐÐÐÐ, ÐÑÑÐÐÐÑÐÐÑÐÑÑÐÑÐ
@@ -962,36 +945,30 @@
 </p>
 
 <p>
-ÐÐÐÐÑÐ ÑÐÑÑÐÐÑÐÑÑÐÑ Tor ÐÐÐÐÑ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ, ÐÐÑÐÑÑÐ ÑÑÑÐÐÐÐÐÐÐÐÑÑ
-ÑÐÐÑÐÑÐÐÐÑÐ ÐÐÐ ÐÐÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÑÑÐÐÐÑ ÐÐÐ ÑÐÑÐ ÐÐÑ ÑÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐÐ
-ÑÐÑÑÐÐÑÐÑÑÐÑÐ. ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÑÑ ÑÐÐÐÐ ÐÑÐÐÑÑÐÐÐÐÐÑ Ð ÐÐÑÐÐÑÐÑÐÐ Tor,
-ÑÐÐÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÐÐÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐ ÐÑÐÐÑ ÐÐÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÐÐÑ Ð ÑÐÐ ÑÐÐÐÐ,
-ÐÐÑÐÑÑÐ ÐÐ ÑÐÐÑÐÑÐÑÑ ÐÐÐÐÐÑÑÐÐÐÐ Ð ÐÐÑÐÑÐÑÑÑÑÐÐ ÐÐÐ ÑÐÑÑÑÑÐÐ. ÐÐÐ ÐÐÐÐÑÐ
-ÑÐÑÑÐÐÑÐÑÑÐÑ ÐÐÐÐÑ ÑÐÑÐÑÑ, Ð ÐÐÐÐÐ ÑÐÑÐÐÑÐÐ, ÑÐÑÑÐÐ Ð ÑÐÑÑÐ ÑÐÐÑÐÑÐÑÑ
-ÐÐÐÐÐÑÑÐÐÐÐ, ÐÑÐÐÐÑÐÐÑÑÑ ÐÐ ÐÑ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐÐÐÐ Ð ÑÐÐÐÑ ÑÐÐÑÑÐÐÐÐÑÑ
-ÑÑÐÐÐÐÑÑ. ÐÑÐÑÐÑÐÐÑÐ ÑÐÐÐÐÐÑ ÑÐÑÑÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐ (FAQ), ÐÐÑÐÑÑÐÐÑÑ <a
-href="<page faq-abuse>#TypicalAbuses">ÑÑÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÑ ÑÑÐÐÐÐÑÑÐÑÑ
-ÐÑÐÐÐÐ ÐÑÐÐÐÐ</a>, Ð ÐÐÑÐÐ ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐ (Mike Perry)
-<a
-href="https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment";>Ð
-ÑÐÐ, ÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐÐÑÑ ÑÐÑÐÐÑ ÐÑÐÐÐÑÑÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐÐ ÑÐÐÐ</a>.
+Each Tor relay has an exit policy that specifies what sort of outbound
+connections are allowed or refused from that relay. The exit policies are
+propagated to Tor clients via the directory, so clients will automatically
+avoid picking exit relays that would refuse to exit to their intended
+destination. This way each relay can decide the services, hosts, and
+networks he wants to allow connections to, based on abuse potential and his
+own situation. Read the FAQ entry on <a href="<page
+faq-abuse>#TypicalAbuses">issues you might encounter</a> if you use the
+default exit policy, and then read Mike Perry's <a
+href="<blog>tips-running-exit-node-minimal-harassment">tips for running an
+exit node with minimal harassment</a>.
 </p>
 
 <p>
-ÐÑÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ ÑÐÐÑÐÑÐÑÑ ÐÐÑÑÑÐ Ð ÐÐÐÐÐÑÑÐÑ ÐÐÐÑÐÑÑÐÑÑ ÑÐÑÐÐÑÐÐ
-(ÐÐÐÑÐÐÐÑ, ÐÑÐÑÐÐÑÑ ÐÐÐ ÑÑÑÐÐÐÑ), ÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#DefaultPorts";>ÐÐÑÐÐÐÑÐÐÐÑÑ</a>
-ÐÐÐÐÑÐÑÑÐ ÑÐÑÐÐÑÑ Ð ÑÐÑÐÐ Ñ ÐÐÑÐÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÑÑÐÐÐÐÐÐÐÐ
-(ÐÐÐÑÐÐÐÑ, ÐÐÑÑÐÐÑÐ ÑÐÑÐÐÑÑ) Ð ÐÑÑÐÐÐ ÑÐÑÐÐÑÑ, ÑÐÑÐÐÐÐÑÐ Ñ ÐÐÑÐÐÐÑÐÐÐÐÑÑÑÑ
-ÐÐÐÐÐÐÐÐÑÑÐÐ ÑÐÑÐ Tor (ÐÐÐÑÐÐÐÑ, ÐÐÐÑÑÑ ÐÐÑÑÑÐ Ð ÑÑÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ
-ÑÐÐÐÐÐÐÐÐÐÐ). ÐÑ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÑ ÑÐÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ, ÐÑÐÐÐÑÐÑÑ ÐÐÐÐÐÑ
-"Sharing" ÐÑÐÐÑÐÐÐÑ Vidalia, ÐÐÐ ÐÑÑÐÐÐÐÑÐÑÐÐÐÐ ÐÑÑÑÐÑÑ ÑÐÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/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="<wiki>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="<wiki>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>
@@ -1067,11 +1044,9 @@
 1.0.0-beta5, ÐÑÐÑÐÑÑ ÑÐÐÑÐÐ Tor ÐÑÐÐÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐ ÑÐÑÐÐÐÐÐÐÐÑÑ Ð
 ÐÑÐÐÐÑÐÐÐÐÑÑ ÑÑÑ ÐÐÐÐÐÐÐÐÑÑÑ.</li>
 
-<li>ÐÑÐÐ ÐÑ ÐÑÐÐÐÑÐÑÐÑÐ Solaris, OpenBSD, NetBSD, ÐÐÐ ÑÑÐÑÑÐ FreeBSD, Tor
-ÐÐÑÐÑÑÐÐ ÑÐÐÐÐÐÑ ÐÑÐÐÐÑÐÑÐ ÐÑÐÑÐÑÑÑ, ÐÐÐÑÑÐ ÐÑÐÐÐÑÐÐÐÐÐÐÑ
-ÐÐÑÐÐÐÐ. ÐÐÑÑÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÐÐÐÐÐÐÑ Ð <a
-href="https://trac.torproject.org/projects/tor/wiki/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="<wiki>TorFAQ#RelayOS">better operating system</a>.</li>
 
 <li>ÐÑÐÐ ÐÑ ÐÑÐ ÐÑÐ ÐÐ ÐÐÐÐÑ ÑÐÑÐÐÐÑÑÑÑ Ñ ÐÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÐ ÑÐÐÐÐ
 ÑÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÑÐÐÑÐÑ. ÐÐÑÑÐÐÑÑ ÐÐÐÑÑÐÐ ÐÑÐÐÑÑÐÐÐÐ
@@ -1179,19 +1154,15 @@
 Tor ÑÐÑÑÐÐÑÐÑÑÐÑÐÐ.</a></h3>
 
 <p>
-ÐÑÐÐ ÐÑ ÐÑ ÑÑÐÐÐÐÐÐÐ ÐÑ ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ Tor ÐÑÐÐÐÑÑÐÐÐÐÐÐÑ ÑÑÐÑÐ
-ÑÐÑÑÐÐÑÐÑÑÐÐ, ÑÑÐ ÐÐÐÐÐÐÐ ÐÑ ÐÐÐ ÑÐÐÐÐÑÐÑÑ ÐÐÑÑÑÐÐ ÑÐÑÐ Ð ÐÐÐÐ ÐÑ
-ÐÐÐÐÐÐÐÐÑÑÑ ÑÐÐÐÐÐÑÐÐÑÑÑÑ ÐÐÑÑÐÐÐÐÑÑÐ ÐÑÐÑ ÐÐÑÐÑ ÐÐÐÑÐÐÐÐÑÐÐÐÐ. ÐÐÐÐÐ ÑÐÐÐ,
-<a
-href="https://trac.torproject.org/projects/tor/wiki/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="<wiki>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>
@@ -1219,14 +1190,13 @@
 </p>
 
 <p>
-ÐÐ-ÐÑÐÑÑÑ, ÐÑ ÐÐÐÐÐÑ ÑÐÑÑÑÐÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÑÑ ÐÑÐÐÐÑ ÐÐÑÑÐÑÐÑÐÐÐ ÐÑÐÐÑÑÐÐÐÐ
-ÑÐÐÑÐÐÐÐÑÑÐ. ÐÐÐÑÑÐ ÐÑÐÐÑ #7 Ð <a href="<page volunteer>#Research">ÑÐÐÐÐÐÐ
-ÐÑÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÑÐÐÐ ÑÑÑÐÐÐÑÑ</a>: "Tor ÐÐ ÐÑÐÐÑ ÑÐÑÐÑÐ ÑÐÐÐÑÐÐÑ Ð
-ÐÐÑÐÑÑÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐ ÐÐ ÐÑÑÐÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑ ÑÐÐÐÐÐÐÐÐÐ (ÐÐÐÑÐÐÐÑ,
-ÐÐÐÐÐÑ ÐÐÐ DSL)". ÐÐÐÐÐÐÐÐ,  <a
-href="https://trac.torproject.org/projects/tor/wiki/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="<wiki>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>
@@ -1259,11 +1229,10 @@
 </p>
 
 <p>
-Ð-ÐÑÑÑÑ, ÐÐÐ ÐÐÐÐÑÐÐÐÐÐ ÑÐÐÑÐÐÐÑÐÑÑ ÑÑÐÐÑ ÐÐÑÐÐÐÑÐÐ, ÑÑÐÐÑ ÐÑÐÐÐÐÐÐÑÑ ÐÑÐÐÐ
-Ð ÑÐÑÑÐÐÑÐÑÑÐÐ ÑÑÐÑÐÐÐ ÐÐÑ ÐÑÑÐÐÑ, Ð/ÐÐÐ Ð ÐÑÐÐÐÑÑÐÐÐÐÐÐÑ ÑÑÐÑÐ ÐÑÐÐÐÐÐÐÐ
-ÑÐÐÐ. ÐÐÐÑÑ ÐÐÐÐÐÑÐ ÐÐÑÐ <a
-href="https://blog.torproject.org/blog/two-incentive-designs-tor";>ÐÐÑÑÐÑÑÐÐ
-ÐÐÐÐ ÐÐ ÑÑÐÐÐ ÐÐÑÐÐÐÑÐÐ Tor</a>.
+Fifth, we might need some sort of incentive scheme to encourage people to
+relay traffic for others, and/or to become exit nodes. Here are our <a
+href="<blog>two-incentive-designs-tor">current thoughts on Tor
+incentives</a>.
 </p>
 
 <p>
@@ -1285,9 +1254,8 @@
 ÐÐÑÐÑÐÐÑ ÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐ?</a></h3>
 
 <p>
-ÐÐÐÐÐÐÑÐÑ ÐÑÐÐÐÑÐÐ ÐÐÑ ÑÑÐÐÑÐÐÐÐ ÐÑÐÐÑÐ ÐÐ ÐÐÐÑÐÑÑ ÐÑÐÐÐÐÐÐÑÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorAbuseTemplates";>ÑÐÐÑÐÐÐ
-ÐÐÐÑÑ</a>.
+A collection of templates for successfully responding to ISPs is <a
+href="<wiki>TorAbuseTemplates">collected here</a>.
 </p>
 
 <hr />

Modified: website/trunk/ru/hidden-services.wml
===================================================================
--- website/trunk/ru/hidden-services.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/hidden-services.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -114,16 +114,16 @@
 </p>
 
 <p>
-Ð ÑÑÐÑ ÐÐÐÐÐÑ ÐÑÐÐÑ ÐÐÐÐÐ, ÑÑÐ ÑÐÑÑÑÑÐ ÑÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÑÑÑ ÐÐÐÐÑÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#Whatsthisaboutentryguardformerlyknownashelpernodes";>ÐÑÐÐÐÐÐ
-ÐÐÑÐÑÑ</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="<wiki>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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -68,17 +68,13 @@
 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="<wiki>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) Ð ÐÐÐ ÐÐÐÐÐÐÐÑÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐÐÐ,
 ÑÑÐÐ ÐÐÑÑÐÐÐ ÑÐÐÑÐÑÑÑ ÐÑÐÐÐÑÑÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐÑÑÐ ÐÐÑÐÑÑ ÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑ
@@ -91,9 +87,10 @@
 <div class="underline"></div>
 
 <ul>
-<li>10 ÐÐÑÑÐÑÑ 2009: ÐÑÐÑÑÐÐÐ ÑÑÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ Tor 0.2.1.20. ÐÑÐÑÐÑÐÐÑÐ <a
-href="https://blog.torproject.org/blog/tor-02120-released";>ÐÐÐÐÑ</a> ÐÐÑ
-ÐÐÐÑÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÐÑÑ.</li>
+<li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
+compatibility issues and lets relays defend themselves from connection
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
+announcement</a> for the list of changes.</li>
 <li>12 ÐÐÑÑÐ 2009: Tor ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐÑ Ð ÐÑÐÐÐÐÑÐÑ ÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑ
 ÐÑÐÐÐÐÐÐÐÑÐÐÑÐÐÑÑÐ. ÐÑÐÑÐÑÐÐÑÐ <a href="<page
 press/2009-03-12-performance-roadmap-press-release>">ÐÑÐÑÑ ÐÐÐÐÐ</a> ÐÐÑ

Deleted: website/trunk/ru/news.wml
===================================================================
--- website/trunk/ru/news.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/news.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -1,185 +0,0 @@
-
-
-
-
-
-
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor: News" CHARSET="UTF-8"
-<div class="main-column">
-
-
-
-<!-- PUT CONTENT AFTER THIS TAG -->
-<a id="News"></a>
-<h2><a class="anchor" href="#News">Tor: ÐÐÐÐÑÑÐ</a></h2>
-<div class="underline"></div>
-
-<ul>
-<li>02 ÐÐÑ 2010: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.1.26. ÐÑÐÑÐÐÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐ
-ÐÑÐÐÐÐÐ ÑÐÐÐÐÑÑÐÐÐÑÑÐ OpenSSL, Ð ÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐÑÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐÐ ÐÑ ÑÐÑÐÐ
-ÑÐÐÐÐÐÐÐÐÐ. ÐÐÐÑÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ Ð<a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>ÐÐÑÑÐÐÐÐÐÐ</a>.</li>
-<li>29 ÐÐÑÑÐ 2009: Tor Ð Printfection ÐÐÐÑÑÐÐÑÑ ÐÐÐÐÐÐÐ Tor. ÐÐÐÑÐÐÐÐÑÑÐ - Ð <a
-href="https://www.torproject.org/press/2010-03-25-tor-store-press-release.html.en";>ÐÑÐÑÑ-ÑÐÐÐÐÐ</a>.</li>
-<li>16 ÐÐÑÑÐ 2010: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.1.25. ÐÑÐÑÐÐÐÐÐÐ ÑÐÐÑÐÑÑÐÑ,
-ÐÐÑÐÐÐÑÐÑÑÑ Ð ÐÐÑÑÐÐ 0.2.1.23, ÑÐÐÑÐÐÐÐÑ ÐÐÐÐÑÐÑÑ ÑÐÑÑÐÐÑÐÑÑÐÑÐÐ ÐÐÑÐÐ
-ÑÐÐÐÑÐÐÑÑ ÑÐÐÐ IP-ÐÐÑÐÑ. ÐÐÐÐÐ ÐÑÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÐÑÑÐÑ ÐÐÑÐÐÑÐÐÐÑÐÑÑ
-ÑÑÐÐÐÐÐÑÑÐÐ. ÐÐÐÑÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ Ð <a
-href="http://archives.seul.org/or/announce/Mar-2010/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>.</li>
-<li>21 ÑÐÐÑÐÐÑ 2010: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.1.24. ÐÑÐÑÐÐÐÐÐÐ
-ÑÐÐÐÐÑÑÐÐÐÑÑÑ Ñ ÐÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐ Apple OSX openssl Ð ÐÐÐÑÑÐÐÐ
-ÑÑÑÐÐÑÐÐÐÐÑÑÑ. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Feb-2010/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ.</li>
-<li>19 ÑÐÐÐÑÑ 2010: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.1.22. ÐÑÐÑÐÐÐÐÐÑ ÐÑÐÑÐÑÐÑÐÐÐ
-ÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑÑÐ Ð ÐÐÑÑÐ ÐÐÑÐÐÑÐÑÐÐ ÑÐÑÐÐÐÐÐÐÑ. Ð ÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ
-ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐÐ ÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ð ÐÐÑÑÐÐÐÑÐÐÐÐÐÐÑ ÐÐÑÐÐÑÐÑÐÐ
-ÑÐÑÐÐÐÐÐÐÑ v3.  ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Jan-2010/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐÐÐ.</li>
-<li>21 ÐÐÐÐÐÑÑ 2009: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.1.21.  ÐÑÐÑÐÐÐÐÐÑ ÐÑÐÐÐÐÐÑ
-Ñ OpenSSL Ð Ñ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÑÐÑÑÐÑÐÐ. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Dec-2009/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐÐÐ. </li>
-<li>10 ÐÐÑÑÐÑÑ 2009: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.1.20.  ÐÐÐÑÑÐÑÐ <a
-href="https://blog.torproject.org/blog/tor-02120-released";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐÐ Ð ÐÐÐÐÐÐÐÐÐ.</li>
-<li>28 ÐÑÐÑ 2009: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.1.19. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Aug-2009/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÐÑÑ.</li>
-<li>25 ÐÑÐÑ 2009: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.0.35. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Jun-2009/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÐÑÑ.</li>
-<li>12 ÐÐÑÑÐ 2009: Tor ÐÐÐÑÑÐÐÐÑ ÐÐÐÐ ÑÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÐ. ÐÐÐÑÑÐÑÐ <a href="<page
-press/2009-03-12-performance-roadmap-press-release>">ÐÑÐÑÑ-ÑÐÐÐÐ</a> ÐÐÑ
-ÐÐÐÑÑÐÐÐÑ ÐÐÑÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ.</li>
-<li>09 ÑÐÐÑÐÐÑ 2009: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.0.34. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Feb-2009/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÐÑÑ. Ð ÑÑÐÐ ÐÐÑÑÐÐ
-ÐÑÐÑÐÐÐÐÐÑ ÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑÑÐ. </li>
-<li>21 ÑÐÐÐÑÑ 2009: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.0.33. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Jan-2009/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÐÑÑ.</li>
-<li>19 ÐÐÐÐÐÑÑ 2008: ÐÑÑÐÐ 3-Ñ ÐÐÑÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐÑÐÑ Tor. ÐÐÐÑÑÐÑÐ <a
-href="<page press/2008-12-19-roadmap-press-release>">ÐÑÐÑÑ-ÑÐÐÐÐ</a> ÐÐÑ
-ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ.</li>
-<li>05 ÐÐÐÐÐÑÑ 2008: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.0.32. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Dec-2008/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÐÑÑ.</li>
-<li>08 ÑÐÐÑÑÐÑÑ 2008: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.0.31. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Sep-2008/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÐÑÑ. </li>
-<li>25 ÐÐÐÑÑÑÐ 2008: ÐÑÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Tor 0.2.0.30. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Aug-2008/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ</a>
-ÐÐÐ <a
-href="https://blog.torproject.org/blog/tor-0.2.0.30-released-stable";>ÐÐÑÑ ÐÐ
-ÐÐÐÐÐ</a> ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐÐ Ð ÑÐÐÐÐÑÐÑÑ ÐÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÐÑÑ.</li>
-<li>25 ÐÐÑ 2008: Tor ÐÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÑÐÐÑ ÐÑ <a href="http://nlnet.nl/";>NLnet
-Foundation</a>. ÐÐÑÐÐÑ ÐÐ ÑÐÑÑÑÐÐÐÐ ÑÐÐÐÑÑ ÑÐÑÑÑÑÑ ÑÐÑÐÐÑÐÐ. ÐÑÐÑÐÑ - ÐÐ
-ÑÐÑÑÑÐÐÐÐ ÑÐÐÐÑÑ Tor ÐÐÑ ÐÐÐÐÐÑÐÐ Ñ ÐÐÐÐÐÐ ÐÑÐÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐÐÑÑÑÑ ÐÐÑÐÑÐÐÑ
-ÑÐÐÐÐÐÐÐÐÑ. ÐÐ <a
-href="http://nlnet.nl/news/2008/20080514-awards.html";>ÑÑÑÐÐÐÑÐ ÐÐÐÑÐÐ</a>
-NLnet ÐÑ ÐÐÐÐÑÐ ÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÑÐÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÐÐÐÐÑ ÐÑÐÐÐÑÐÑ.</li>
-
-<li>13 ÐÐÑ 2008: <a
-href="http://archives.seul.org/or/talk/May-2008/msg00048.html";>Ð Tor
-0.2.0.26-rc</a> ÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐ ÐÐÑÑÐÐ ÑÐÑÐÐÐÐÐÐÑ ÐÐÑÐÐÑÐÑÐÑÐÐ V3,
-ÐÐÑÐÑÑÐ ÐÑÐ ÐÐÐÐÑÐÐ ÑÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÐ <a
-href="http://lists.debian.org/debian-security-announce/2008/msg00152.html";>ÐÐÐ
-Ð Debian OpenSSL</a>.  <strong>ÐÑÐ ÐÐÐÐÐÐÐÐÐÑÐÐÐÐÐÑÐ ÐÑÑÐÐ, ÐÐÑÑÐÐÐÐÐÐÐÑÐ
-ÐÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ.</strong> ÐÐÐÐÑÐ, ÐÑÐ ÐÑÐÐÐÑÐÑÐÑ ÐÐÐÑÑ-ÐÐÐÐ ÐÐÑÑÐÑ ÐÐ
-ÑÐÑÐÐ 0.2.0.x, ÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ ÐÐ, ÐÐ ÑÐÐÑÑÑ ÐÐ ÑÐ, ÐÑÐÐÐÑÐÑÐÑÑÑ Debian ÐÐÐ
-ÐÐÑ. ÐÐÐÐÐ, ÐÑÐÐ ÑÐÑÐÐÑÐÐ, ÐÐ ÐÐÑÐÑÑÑ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑ-ÐÐÐÐ ÐÐÑÑÐÑ Tor, ÑÑÐ
-ÐÐÑÑÐ ÑÐÐÐÐÑÐÑÐÐÐÐÑ Debian, Ubuntu ÐÐÐ ÐÑÑÐÐÐ ÐÑÐÑÐÑÐÐÐ ÐÐÑÑÑÐÐÑÑÐÐÐ,
-ÐÐÐÐÐÐÐÐ, ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÑÑÐÐ. ÐÐÑ ÐÐÐÐÐÐÐÑÐÐÑÐÐÐ
-ÐÐÑÐÑÐÐÑÐÐ ÑÐÐÑÑÐÑÐ ÐÐÑÐ <a
-href="http://archives.seul.org/or/announce/May-2008/msg00000.html";>ÑÐÐÐÐÐÐÐÐÑÐÐ
-ÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÑÐÐÑÑÐ</a> ÐÐÐ <a
-href="https://blog.torproject.org/blog/debian-openssl-flaw%3A-what-does-it-mean-tor-clients%3F";>ÐÐÐÐÐÐÐÐÐÐ
-ÐÐ ÐÐÐÐÐ</a>. ÐÐÐ ÐÑÐÐÐÐ, ÐÑ ÐÐÐÐÑÐ ÐÐÐÑÐ ÐÐÑÑÐÑ Tor 0.2.0.26-rc ÐÐ <a
-href="https://www.torproject.org/download#Dev";>ÑÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐ</a>.</li>
-<li>ÐÐÑÑ 2008: <a
-href="https://blog.torproject.org/blog/tor-project-google-summer-code-2008!";>ÐÑÐÐÐÑ
-Tor Ð Google Summer of Code 2008!</a></li>
-
-<li>ÐÐÐÑÐÐÑ 2008: <a href="https://www.torproject.org/people#Board";>ÐÐÐÐÑ
-ÐÐÑÐÐÑÐÑÐÐ</a> ÐÑÐÐÐÑÑÑÐÑÐÑ Ð ÑÐÐÐÑ ÑÑÐÐÑ<a
-href="https://blog.torproject.org/blog/isaac-mao-elected-one-our-new-directors";>ÐÑÐÐÐÐ
-ÐÐÐ</a>. ÐÑ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÐÑÐÐÑ Ð ÐÐÐÐÐ Ð ÑÐÐÐÐÑÐÐ
-ÐÑÐÐÐÑÐ.</li>
-
-<li>ÐÐÐÑÐÐÑ 2008: Tor ÑÑÐÑÑÐÐÐ ÐÐÑÑÐÐÑÑ Ð ÐÐÐÑÑÐÐ <a
-href="https://blog.torproject.org";>ÐÑÐÑÐÐÐÑÐÐÐÐ ÐÐÐÐÐ Tor</a>.</li>
-
-<li>ÐÐÐÐÑÑ 2008: <a href="<page download>">Ð Tor 0.1.2.19</a> (ÐÐÑÐÐÐÐÑÑ
-ÑÑÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ) ÐÑÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐ ÑÑÐÑÐÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÐ
-ÑÐÐÐ, ÐÐÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÐ, ÑÑÑÐÐÐÐÐÐÐÐÐÐÑÑ ÐÐ ÑÐÐÐÑÐÐÐÑ (ÐÐÐ
-ÑÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÑÐÐÑÐÐÐÑÐÐ), Ð, ÑÐÐÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐ
-ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐ ÑÑÐÐÐÐÐÑÑÑ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ; ÐÐÐÐÐÐ ÐÑÐÑÐÐÐ
-ÐÑÐÑÐÐÐÐÐÑ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ. ÐÐÐÐÐÑÐÑÑÐ, ÑÑÑÐÐÐÐÐÑÐ
-ÐÐÐÐÐÐÐÐÐÐ. ÐÐÐÑÑ ÐÐÑÑÑÐÐÐ ÐÐÐÐÐÐ <a
-href="http://archives.seul.org/or/announce/Jan-2008/msg00000.html";>ÐÐÐÑÐÐÐÐ
-ÑÐÐÐÐÐ</a>.</li>
-
-<li>ÐÐÑÑÐÑÑ 2007: <a href="<page download>">Ð Tor 0.1.2.18</a> (ÐÐÐÐÑ ÑÑÐÐÐÐÑÐÐÑ
-ÐÐÑÑÐÑ) ÐÑÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ, Ð ÑÐÐ ÑÐÑÐÐ ÐÑÐÑÐÐÑÑÐÐ ÑÐÐÐ Ð ÑÐÐÐÑÐ
-ÑÐÑÑÐÐÑ ÐÐÐÐ, ÐÑÐÐÐÐÐÑ Ñ ÐÐÑÑÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÑÑÐ ÑÐÑÐÐÑ, ÐÐÑÐÑÑÐ ÐÑÐÑÐÐÐÐ
-ÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ; Ð ÑÐÐÐÐ ÐÐÐÑÑÐÑ ÐÑÐÐÐÐ Ð ÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐ, ÐÐÑÐÑÐÑ ÐÐÐÐÑÐ
-ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÑÐÐ ÑÐÑÐÐ ÐÑÐÐÐÐÐÐÐ Ð ÐÑÑÐÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÑÑÑ ÑÐÑÐÐÑÐÐ ÑÐ
-ÑÐÐÑÐÐÐ ÑÑÐÑÑÑÐ ÑÐÑÐ. ÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑÑ ÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÑÐÐÑÑÑÑ, ÐÑ
-ÑÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÑÐÑÐÐÐÐÑÐ ÑÐÐÐÑ Privoxy (ÑÑÑÐÐÐÐÐÐ ÐÐ
-ÑÐÐÐÑÐÐÐÑ), ÐÐÑÑÐÐÑ, ÐÑÐ ÐÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑÐÑÑ, ÑÑÐ ÐÑÐÐÑ "install Privoxy"
-ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ.  ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Oct-2007/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ
-Ð ÑÐÐÐÐÐ</a>.</li>
-
-<li>ÐÐÑÑÐÑÑ 2007: ÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑ ÐÐÐÑÑ, Ð ÑÐÐÑÐÐÐ ÑÑÐÐÐ ÐÐÐÐ ÐÑÐÐÐÑ Tor ÑÑÐÐ
-<a href="<page people>">ÐÐÐÐÐÐÑÐÐÑÐ Ð ÐÑÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑÑÐÑÐÐÐ</a>. ÐÑ
-ÑÐÐÐÐÐÐ ÑÑÐ, ÑÑÐÐÑ ÐÐÐÑÑ ÐÐÐÐÐÐÐÐÑÑÑ ÐÐÐÑÑÐÑÑ ÐÑÐÐÑÑ ÐÑ ÐÑÑÐÐ, ÐÐÐÑÑÑÐÑ
-ÐÐÐÐÑÑÐÐÐÐÐÐÑ ÐÐÑ ÐÐÐ, Ð ÑÑÐÐÑ ÐÐÑÐ ÐÐÐÐÑÑ ÐÐÐÐÐ ÐÑÑÐÑÐÑÑ ÑÑÐÐÐÐÑÐ <a
-href="<page donate>">ÐÐÐÐÑÑÐÐÐÐÐÐÑ</a>, ÑÐÐÐÐÐÐÑÐ ÐÐÑ ÐÐÑ. <br /> ÐÑ ÑÐÑÐÐ
-ÐÑÑÐÐÐÑÑ ÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÑÐÐÑÑÑ <a href="https://www.eff.org/";>ÐÐÐÐÑ
-ÐÐÐÐÑÑÐÐÐÑÑ ÐÑÐÐÐÐÐ (EFF)</a> ÐÐ ÐÐÐÐÐÑÐÐÑ, ÑÐÐÐÑÐÑÑÑÐÐ Ð ÐÐÐÑÐÑÐÑ
-ÐÐÐÐÐÐÐÐÐÐÐÐÐÐÑ, ÐÐÐÐÑÑ Ð ÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÑÑ ÐÐÑÐÑ ÐÐÐ ÑÑÑÐÐÐÑ, Ð ÑÐÐÐÐ ÐÐ
-ÐÐÑÑÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐÑ Ð ÑÐÐÐÑÑ ÐÐÑÐÐ, ÐÑÐ ÑÐÐÑÐÐ ÐÑÑÐÑÑÐÐ ÐÐ ÐÐÐÐ,
-ÐÐÐÐÐÐÐÑÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐÐ.</li>
-
-<li>ÐÐÐÑÑÐÑÑ 2007: ÐÑÐÐ ÐÑ ÐÐÐÑÑÐÐÐ ÑÐÐÐÑÑÐÐÐÐÐ ÐÐÑÑÐÐ ÑÐÐÐÑ ÐÑ Tor, ÑÑÑÐÑÐ, ÑÑÐ
-ÐÐÐ ÐÑÐÐ ÐÐ ÐÑ ÐÐÑ. <a href="<page download>">ÐÑÐÑÐÐÐÑÐÑÐ ÐÐÐÐÑÑ Tor</a>
-ÐÐÐÑÑ ÐÑÑÑ <a href="<page verifying-signatures>">ÐÐÐÑÐÐÑÐÐÐÐÑ ÐÐÐ
-ÐÑÑÐÐÑÐÑÐÑÐ</a>.</li>
-
-<li>ÐÐÐÑÑÑ 2007: <strong>ÐÐÐÐÐÑÐÑÑÐ, ÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐ
-Tor!</strong> ÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ (ÑÑÐÐÐÐÑÐÐÑ: 0.1.2.17; ÑÐÑÐÐÑÐÐÐÐÑÐÐÑÐÐÑ:
-0.2.0.6-alpha) ÑÑÑÑÐÐÑÑÑ ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐÐÑÑÐ. ÐÐÐÑÑÐÑÐ <a
-href="http://archives.seul.org/or/announce/Aug-2007/msg00000.html";>ÐÐÑÑÐÐÐÐÐÐ
-Ð ÐÑÑÐÐÐ</a> ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ.</li>
-
-<li>ÐÐÐÑÐÐÑ 2007: ÐÑÐÐÐÑ Tor Ð UColo/Boulder <a
-href="http://blogs.law.harvard.edu/anonymous/2007/02/26/the-rumors-of-our-demise/";>ÐÑÐÐÑÐÑÑ</a>
-ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÐÐ ÐÐÐÑÐÑÐÐ, ÐÐÑÑÑÐÐÐÑÐÑ ÐÐÐÐÐÐÐ  ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÑÐÐÐÑÐ,
-ÑÐÐÐÑÑÑÐÑÑÑÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐ ÐÐ Tor.</li>
-
-<li>ÐÐÐÐÑÑ 2007: ÐÐÐÐÑÐÑÑÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÑÐÑÐ Tor ÐÐÐÑÐÑÐÐ ÐÐ ÑÐÑÐÐ
-ÑÑÑÑÑ. ÐÐÐÑÐÐÐÑÑÐÐÐ ÑÐÐ ÐÐ ÐÐÐÑÑ ÑÐÑÐÐÐÑÑÑÑÑ Ñ ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑ ÑÑÐÐÑÐÐ,
-ÐÑÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÐ Ð ÐÑÐÐ ÐÐÐÑÐÐÐÑÐÑÐÐÐ. <a href="<page volunteer>">ÐÐÐ
-ÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÑÑ!</a></li>
-
-<li><b>ÐÑ ÐÐÑÐÐÐÐ ÐÑÐÐ ÐÐÐÑÑ ÑÐÐÐÑÐÑÐÐ Ð ÐÐÐÐÐÐÐÑÐÐÑÐÐÐ ÑÐÐÐÐÑÐÑÐÐÐÐÐÐ.</b> ÐÑÐÐ
-ÐÐÑÐ ÐÑÐÐÐÐÐÐÑÐÑ ÐÐÐÐÑÐÑÐÑÐÐÐÐÐ Ð ÐÐÐÐÐÑÐÐÐÐÐ Tor Ð ÐÐÑÐÑÑÐÐ ÑÐÐÐÐÐÐ Ð
-ÐÑÑÑÑÐÐ ÑÐÑÐ, ÐÐÐÐÐÑÐÑÑÐ, <a href="<page contact>">ÑÐÑÐÐÑÐÑÑ Ñ ÐÐÐÐ</a>. ÐÐ
-ÑÐÐÐÐ ÑÑÐÑÐÐÑ ÐÑ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÑÐÑÐÐ Tor ÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐ, ÐÐÐÐÐÑÐÐÑ,
-ÑÐÐÐÐÐÑ (ÐÑÐÐ ÐÐÐ ÑÐÑÑÑ ÑÑÐÐÐ), ÐÐÐ ÑÐÐÐÐ ÐÐÐÑÑ ÐÐÐÑÑÑ ÐÐ ÐÐÐÑÐÐÐÐÐÐÑ ÐÐÑÐÑ
-ÐÑÑÐÐÐÐÐÐÐÐÐ Ð ÑÐÐÐÐÑÐÑ. <a href="<page donate>">ÐÐÐÐÐÑÐÑÑÐ, ÐÐÐÑÐÑÐ
-ÐÐÐÐÑÑÐÐÐÐÐÐÐ.</a></li>
-
-</ul>
-
-</div>
-
-
-
-#include <foot.wmi>

Modified: website/trunk/ru/people.wml
===================================================================
--- website/trunk/ru/people.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/people.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -235,11 +235,9 @@
 Tor Ñ ÐÐÐÑÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ Windows.</dd>
 <dt>rovv (ÐÑÐÐÐÐÐÐÐ - ÐÐÑ ÑÐÐÐÐÑÑ ÐÑÑÐÑÑÑÑ ÐÐÐÐÐÐÑÑÐÑÐ, ÐÐÐÐ ÐÐÑ ÐÐÑ!)</dt><dd>ÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐÐ Ð ÐÐÐÐÑ, ÐÐÑÐÑÐÐÐ ÐÑ ÐÐÐÐÐ-ÐÐÐÐ ÐÐÐÐÐ. ÐÐ, ÐÐÐÐÐÐ
 ÐÑÑÑ, ÑÐÑÐÐÑ ÐÑÑÐÐÐÑÐ ÐÐÐ Tor ÐÐÐÐÑÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐÐÐ.</dd>
-<dt>tup (ÐÑÐ ÐÐÐÐ ÐÑÐÐÐÐÐÐÐ)</dt><dd>ÐÐÑÐÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÑÐÑ ÐÐÐÑÐ ÐÐÐÐÐÐÐÐÑÑÐ, ÑÐÑÐÑÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐÐ Tor Ð
-ÐÐÑÐÑÑÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/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="<wiki>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
@@ -268,20 +266,20 @@
 href="https://svn.torproject.org/svn/topf/trunk/README";>TOPF</a> - ÑÑÐÐÐÑÐÐ
 ÐÐÑ Tor.</dd>
 <dt>ÐÐÐ ÐÑÑÐÐÑÑ</dt><dd>ÐÐÑÐ ÐÑÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÑ Ð ÐÐÑÑÐÐÐÐ.</dd>
-<dt>ÐÐÐÐÐÐ ÐÐÐ</dt><dd> ÐÐÐÐÑÐÐ ÐÐÐ ÑÐÑÑÑÐÐÐÐÐ ÐÑÐÐÑÐ ÐÑÑÐÐ Ð Tor (<a
-href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/";>svn</a>)
-Ð <a
-href="<gitblob>doc/spec/proposals/151-path-selection-improvements.txt">ÐÑÐÐÐÐÐÐÐÐÐÐ
-151</a> Ð ÐÐÑÐÑÑÐÐ ÑÐÑÑÐ Google Summer of Code 2008.</dd>
+<dt>ÐÐÐÐÐÐ ÐÐÐ</dt><dd> Worked on Improving Tor Path Selection (<a
+href="https://svn.torproject.org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/";>svn</a>)
+and <a
+href="<gitblob>doc/spec/proposals/151-path-selection-improvements.txt">proposal
+151</a> as part of Google Summer of Code 2008.</dd>
 <dt>ÐÑÐÐ ÐÐÑÐ</dt><dd>ÐÐ ÐÐÑÐ Tor ÐÐÐÐÐÐÐ Ð ÑÐÐÑÐÐÐÑÐÐ ÐÐÑÐÑ ÐÐÑÐÐÐÐÐÐÐ ÑÐÑÐÐÐÐÐÐÑ ÐÐÑÐÐÑÑÐÐÐÐ.</dd>
 <dt>ÐÑÑ ÐÐÐÐ</dt><dd>ÐÐÐÐÐÑÐÐÑ Incognito LiveCD.</dd>
 <dt>ÐÐÐÐÑÑ ÐÑÐÐÐ</dt><dd>ÐÐÑÐÐ <a href="https://svn.torproject.org/svn/blossom/trunk/";> ÐÑÐÐÐÑ
 Blossom</a>, ÐÐÑÐÑÑÐ ÐÑÐÐÐÑÐÑÐÑ Tor Ð ÐÐÑÐÑÑÐÐ ÑÐÑÐ-ÐÐÐÑÐÐÑ; ÑÐÐÐÐ ÐÐÐÐÐÐÐ Ð
 ÑÐÐÑÐÐÐÑÐÐ ÐÐÐÑÑÐÐÑÐÐÐÐ ÐÐÑÐÑÑÐÐÑÐ Tor, ÑÑÐÐÑ ÐÐ ÐÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐ, ÐÐÐÐÐ ÐÐ
 ÑÐÐÑÐÑÑÑ ÑÐÐÑÐÑ.</dd>
-<dt>ÐÐÐÐÑÐÐ ÐÐÑÐÑÐ</dt><dd> ÐÐÐÐÑÐÐÑ ÐÐÐ ÑÐÑÑÑÐÐÐÑÐÐ ÑÐÐÐÐÑÐ ÐÑÑÐÐÐ Tor (<a
-href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/torflow/branches/gsoc2008/";>svn</a>),
-ÐÐÐÐÑÐÐÑÐÐ ÐÑÐ ÑÐÑÑÑÑ Google Summer of Code 2008.</dd>
+<dt>ÐÐÐÐÑÐÐ ÐÐÑÐÑÐ</dt><dd> Working on Tor exit scanner improvements (<a
+href="https://svn.torproject.org/cgi-bin/viewvc.cgi/torflow/branches/gsoc2008/";>svn</a>),
+originally started as part of Google Summer of Code 2008.</dd>
 <dt>ÐÑÐÑÑÐÐÐ ÐÑÐÑÐÑÑ</dt><dd> ÐÐÐÑ ÐÐÐÐÐ Ð ÑÐÑÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐ.</dd>
 <dt>ÐÑÐÐÐÐ ÐÐÐÐÐ</dt><dd> ÐÐÑÑÐÐÐÐ ÑÑÑÐÐÐÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÐÐ ÑÐ, ÑÑÐ ÐÐÐÐÑÐÐÐÐÐ.</dd>
 <dt>ÐÐÑÑÑÐÐ ÐÐÐÐÐ</dt><dd>ÐÑÐ ÐÐÐÐ ÑÐÐÑÐÐÐÑÑÐÐ Vidalia.</dd>
@@ -318,9 +316,9 @@
 ÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐÑ ÐÐÐÐÐ ÐÑÐÑÐÑÑÑ ÐÐ <a
 href="http://www.eff.org/about/staff/?f=fred_von_lohmann.html";>ÐÐÐÑÐ
 ÐÐÑÑÐÐÐÐÐ EFF</a>.</dd>
-<dt>ÐÑÐÑÑÐÐÐ ÐÐÐÐÑ</dt><dd> ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÐÐ ÑÐÐÐÐÑÐÐÐÑ ÐÑÐÐÐÐÐÐÐÑÐÐÑÐÐÑÑÐ ÑÐÑÑÑÑÑ ÑÐÑÐÐÑÐÐ Tor (<a
-href="https://svn.torproject.org/cgi-bin/viewcvs.cgi/tor/branches/hidserv-perf/";>svn</a>)
-ÐÐÐ ÑÐÑÑÑ Google Summer of Code 2008.</dd>
+<dt>ÐÑÐÑÑÐÐÐ ÐÐÐÐÑ</dt><dd> Worked on Performance Enhancing Measures for Tor Hidden Services (<a
+href="https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-perf/";>svn</a>)
+as part of Google Summer of Code 2008.</dd>
 <dt>ÐÐÐÐÐÐÐÐ Ð. ÐÐÑÐ</dt><dd><a href="http://jilliancyork.com/";>ÐÐÐÐÐÐÐÐ Ð. ÐÐÑÐ </a> - ÐÐÑÐÑ, ÐÐÐÐÐÐÑ Ð
 ÐÐÑÐÐÐÑÑ, ÐÐÐÑÑÐÐ Ð ÐÐÑÑÐÐÐ. ÐÐ ÐÐÑÐÑ ÐÐÐÐ-ÑÑÐÑÑÐ ÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÐ Tor Ð Ð
 ÐÑÑÐÐÑ ÐÐÐÑÐÑÐÑ ÐÐÐÐÐÐÐÐÑÑÐ ÐÐ <a

Modified: website/trunk/ru/sponsors.wml
===================================================================
--- website/trunk/ru/sponsors.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/sponsors.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -26,14 +26,14 @@
 
 <h3><i>Liliopsida</i> (ÐÐ 750 ÑÑÑÑÑ ÐÐÐÐÐÑÐÐ ÐÐÐ)</h3>
 	<ul>
-		<li><a href="http://www.bbg.gov/";>Broadcasting Board of Governors</a>
-(2006-2010)</li>
+		<li><a href="http://www.()bbg.gov/">ÐÑÐÐÐÑÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÑ ÐÐ ÐÐÐÐ Ð ÐÐÐÐÐ
+ÐÐÑÐÐÐÑ</a> (2006-2010)</li>
 	</ul>
 
 <h3><i>Asparagales</i> (ÐÐ 500 ÑÑÑÑÑ ÐÐÐÐÐÑÐÐ ÐÐÐ)</h3>
 	<ul>
 		<li>ÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐ (2006-2008)</li>
-        <li><a href="http://www.nsf.gov/";>National Science Foundation</a></li>
+        <li><a href="http://www.nsf.gov/";>ÐÐÑÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÑÐ ÐÐÐÐ</a></li>
 	</ul>
 
 <h3><i>Alliaceae</i> (ÐÐ 200 ÑÑÑÑÑ ÐÐÐÐÐÑÐÐ ÐÐÐ)</h3>

Deleted: website/trunk/ru/tshirt.wml
===================================================================
--- website/trunk/ru/tshirt.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/ru/tshirt.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-#include "head.wmi" TITLE="Tor: T-shirt" CHARSET="UTF-8"
-<div class="main-column">
-
-<h2>Tor: ÑÑÑÐÐÐÐÐ ÐÐÑ ÑÐÐÐÐÑÑÐÐÑ</h2>
-<hr />
-
-<p>ÐÑ ÐÐÐÐÑÐ ÐÐÐÑÑÐÑÑ ÐÐÐÑ ÐÐ ÑÑÐÑ ÐÐÐÑÑÐÑÑ ÑÑÑÐÐÐÐÐ Tor, ÐÐÐÐÑ ÐÐÐÐÐ Ð
-ÑÐÐÐÐÑÐÐ ÐÑÐÐÐÑÐ Tor. ÐÑÑÑ ÑÑÐ ÐÐÐÐÐÑÑ ÐÑÑÐ ÑÐÐÐÐÑÑÐÐÑ:</p>
-
-<ol>
-<li>ÐÐÐÐÐÑÐÐ ÐÐÐÑÑÐÐ ($65+) <a href="<page donate>">ÐÐÐÐÐ</a> Ð ÐÑÐÐÐÑ Tor.</li>
-<li>ÐÑÐÐÐÑÑÐÐÐÑÑÑ ÐÑÑÑÑÑÐ <a href="<page docs/tor-doc-relay>">ÑÐÑÑÐÐÑÐÑÑÐÑ
-Tor</a>, ÐÐÑÐÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐ ÐÑÐÑÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÑ ÐÐÑÑ ÐÐÑÑÑÐÐ: ÐÑÐ ÑÑÐÐ ÐÑ
-ÐÐÐÐÐÑ ÑÐÐÑÐÑÐÑÑ ÐÑÑÐÐ ÑÐÑÐÐ 80 ÐÐÑÑ Ð ÐÐÑ ÑÑÐÐÐÐÑÑÐÑÐÑÑÐÑÐÑÐÐÐ ÑÑÐÑÐÐ
-ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑÑÑ 100 ÐÐ/ÑÐÐ, ÐÐÐ, ÐÑÐÐ ÐÐÑ ÑÐÑÑÐÐÑÐÑÑÐÑ ÐÐ ÐÑÐÐÐÐÐÐ, ÐÐÑ
-ÑÑÐÐÐÐÑÑÐÑÐÑÑÐÑÐÑÐÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑÑÑ 500 ÐÐ/ÑÐÐ.</li>
-<li>ÐÐÑÐÐÐÐÑÑÐÑÐÑÐ <a href="<page volunteer>">Ð ÐÑÑÐÐÐ</a>. <a href="<page
-translation>">ÐÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑ Ñ ÐÐÑÐÐÐ ÐÐÐ-ÑÐÐÑÐ ÐÐ ÐÐÑ
-ÑÐÑÐ</a>. ÐÐÐÐÑÐÑÐ ÑÐÑÐÑÑÑ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms";>ÐÐÐÐÐÑÐÐÐÐÑÑÑÑ
-Tor ÐÑÐÐÑÐÐÐÑ Ð ÑÐÐÐÐÐÑÐ ÑÐÐ, ÑÑÐÐÑ ÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÑÐÐ ÐÑÑÐÐÑ
-ÐÑÐÐÐ</a>. ÐÑÑÐÐÐÑÐÑÐ Tor Ð ÐÐÐÑÐÑÑ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÐÑÑÐ, ÐÑÐÑÐÐÑÑÐ
-ÐÐÐÐÑÐÑÑÐ ÐÐ <a href="https://bugs.torproject.org/";>ÐÐÑÐÑ ÐÐÐÐÐ</a>, ÐÐÐ
-ÑÑÐÐÑÑÐ ÑÑÐÑÐÐÐÐÐÐÐ Tor.
-</li>
-</ol>
-
-<p>
-ÐÑÐÐ ÐÑ ÐÑÐÐÑÐÐÑÐ ÐÑÑÐÑÐÐÐÐÐÐÑÐ ÑÑÐÐÐÐÐÐÐÑÐ, ÐÑÐÑÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑÐÑ
-donations[ÑÐÐÐÐÐ]torproject[ÑÐÑÐÐ]org Ñ ÐÑÐÑÐÐÐ ÐÐÑÑÑÐÐÐÐÐÐ. ÐÐ ÐÐÐÑÐÑÑÐ
-ÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐ ÑÐÐÑ, ÑÐÐÐÐÑ (S/M/L/XL/XXL), ÐÐÐÐÐÐÐÑÐÐÑÐÑÐ ÑÐÐÐÐÑ, ÐÐ
-ÑÐÑÑÐÐ ÐÑÐÐ ÑÑÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐ ÑÐÐÐÐÑÐ Ñ ÐÐÑ ÐÐÑ, Ð ÐÐÑÐÑ ÐÐÑÑÐÐÐÐ.
-</p>
-
-<p>
-ÐÑ ÐÐÐÐÑÐ ÐÑÐÑÐÑÑ ÐÐÐÐÑ ÑÑÐÐÐÑÐÐÐÐÑÐ ÑÐÑÐÑÐ Ð ÐÐÑÐÐ ÐÐÐÑÐÑÐÐÑÑÐÐ-ÐÐÑÐÐÐÐ
-ÑÐÐÑÐÐ-ÐÐÐÐÐÑÐ. ÐÑ ÐÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐÐÑÑÐÑÑ ÐÐ ÑÑÑÐÐÐÐÐ <a
-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorShirt";>Ð
-ÐÐÐÐÐ</a>; ÐÐÐÐÐÐÑÐÑÐ ÑÑÐÐ Ð ÑÐÐÐ ÑÐÑÐÐÑÐÑÐÐ.
-</p>
-
-<div style="text-align: center">
-<a href="tshirt/black-tor-tshirt.png"><img src="tshirt/black-tor-tshirt.png"
-/></a> <a href="tshirt/green-tor-tshirt.png"><img
-src="tshirt/green-tor-tshirt.png" /></a>
-</div>
-
-  </div>
-
-
-
-#include <foot.wmi>

Modified: website/trunk/se/index.wml
===================================================================
--- website/trunk/se/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/se/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -63,14 +63,13 @@
 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="<wiki>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
@@ -83,11 +82,10 @@
 <div class="underline"></div>
 
 <ul>
-<li>21 Februari 2010: Tor 0.2.1.24 slÃppt i stabil version.  Fixar
-kompatibilitet med nya Apple OSX openssl-fÃrÃndringar och lÃgger till vissa
-hastighetsfÃrbÃttringar.  LÃs hela <a
-href="http://archives.seul.org/or/announce/Feb-2010/msg00000.html";>meddelandet</a>
-fÃr en lista pà alla fÃrÃndringar.</li>
+<li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
+compatibility issues and lets relays defend themselves from connection
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
+announcement</a> for the list of changes.</li>
 <li>29 Mars 2010: Tor och Printfection presenterar Tor-butiken.  Fler detaljer
 finns tillgÃngliga i <a href="<page
 press/2010-03-25-tor-store-press-release>">press-meddelandet</a>.</li>

Modified: website/trunk/torbrowser/fr/index.wml
===================================================================
--- website/trunk/torbrowser/fr/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/torbrowser/fr/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -32,10 +32,11 @@
 maniÃre permanent ou si vous n'utilisez pas Windows, consultez les autres
 moyens de <a href="<page download>">tÃlÃcharger Tor</a>.</p>
 
-<p>Freedom House has produced a video on how to find and use the Tor Browser
-Bundle.  If you don't see a video below, view it at <a
-href="http://www.youtube.com/thetorproject";>Youtube </a>.  Know of a better
-video or one translated into your language? Let us know!</p>
+<p>Freedom House a produit une vidÃo qui montre comment trouver et utiliser le
+Pack de Navigation Tor.  Si vous ne voyez aucune vidÃo ci-dessous,
+consultez-la sur <a href="http://www.youtube.com/thetorproject";>Youtube
+</a>.  Vous connaissez une meilleure vidÃo ou une qui serait traduite dans
+votre langue ? FaÃtes-le nous savoir !</p>
 
 <div class="center">
 <p><video id="v1" src="http://media.torproject.org/video/2009-install-and-use-tor-browser-bundle.ogv"; autobuffer="true" controls="controls"></video></p>
@@ -112,7 +113,7 @@
 (ru)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_ru.exe.asc"
 style="font-size: 90%;">signature</a>)</li>
 
-<li><a href="dist/tor-browser-<version-torbrowserbundle>_vi.exe">Vietnamese
+<li><a href="dist/tor-browser-<version-torbrowserbundle>_vi.exe">Vietnamien
 (vi)</a> (<a href="dist/tor-browser-<version-torbrowserbundle>_vi.exe.asc"
 style="font-size: 90%;">signature</a>)</li>
 
@@ -191,7 +192,7 @@
 href="dist/tor-im-browser-<version-torimbrowserbundle>_ru.exe.asc"
 style="font-size: 90%;">signature</a>)</li>
 
-<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_vi.exe">Vietnamese
+<li><a href="dist/tor-im-browser-<version-torimbrowserbundle>_vi.exe">Vietnamien
 (vi)</a> (<a
 href="dist/tor-im-browser-<version-torimbrowserbundle>_vi.exe.asc"
 style="font-size: 90%;">signature</a>)</li>

Modified: website/trunk/torbrowser/ru/index.wml
===================================================================
--- website/trunk/torbrowser/ru/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/torbrowser/ru/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -328,7 +328,7 @@
 
 
 
-<p>ÐÐÑÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÑÐÑÐÐ <a href="<page verifying-signatures>"Ð ÐÑÐÐÐÑÐÐ
+<p>ÐÐÑÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÑÐÑÐÐ <a href="<page verifying-signatures>Ð ÐÑÐÐÐÑÐÐ
 ÐÐÐÐÑÐÑÑ ÐÐÐÐÐÑÐÐ</a>, ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑÑ ÐÐÐ ÑÐÐÐÐÑÑÑÑ, ÑÑÐ ÐÑ ÑÐÐÑÐÐÐ ÐÐÐÐÐÐ
 ÑÐÑ ÑÐÐÐ, ÐÐÑÐÑÑÐ ÐÑ ÐÐÐÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÑÐÐÐÑÑ. ÐÐÐÐÐ, ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐ, ÑÑÐ
 Firefox Ð ÐÐÑÐÐ ÐÐÐÐÑÐ <a

Modified: website/trunk/torbrowser/ru/split.wml
===================================================================
--- website/trunk/torbrowser/ru/split.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/torbrowser/ru/split.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -30,7 +30,7 @@
 <code>.exe</code> Ð ÐÑÐ ÑÐÐÐÑ Ñ ÑÐÑÑÐÑÐÐÐÐÐ <code>.rar</code>). ÐÐÐÐÑ Ð
 ÐÐÐÐÐ <code>signatures</code> ÐÐÐÐÐÐÑÑÑ ÑÐÐÐÐÑÑÑÑ, ÑÑÐ ÐÑ ÑÐÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐ,
 ÑÑÐ ÐÑ ÐÐÐÐÑÐÐÐÐÐÑÑ ÐÐÐ ÐÑÐÐÐÑÑÐÐÐÑÑ. ÐÐÐÐÐÐÐÑÑÐÑÑ Ñ ÐÐÑÐÐÐ ÐÐÑÑÑÑÐÑÐÑÐÐ
-ÐÐ<a href="<page verifying-signatures>">ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ</a></p>
+ÐÐ<a href="<page verifying-signatures>ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ</a></p>
 
 <p id="Download-torbrowserbundle" style="font-size: 120%; margin: 5mm">Tor Browser Bundle ÐÐÑ ÐÐÐÑÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÑ Windows Ñ ÐÑÐÑÐÐÑÐÐ Firefox
 (ÐÐÑÑÐÑ <version-torbrowserbundle>, ÐÐÑÐÐÐÑ "ÑÐÐÐÐÑÑÑ" ÑÐÐÐÐÐ, ÐÐÑÐÐ ÐÐÑÐÐ

Modified: website/trunk/torbutton/fr/faq.wml
===================================================================
--- website/trunk/torbutton/fr/faq.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/torbutton/fr/faq.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -89,19 +89,19 @@
 
 <p>
 
-YouTube and similar sites require third party browser plugins such as
-Flash.  Plugins operate independently from Firefox and can perform activity
-on your computer that ruins your anonymity. This includes but is not limited
-to: <a href="http://decloak.net";>completely disregarding proxy settings</a>,
-querying your <a
-href="http://forums.sun.com/thread.jspa?threadID=5162138&amp;messageID=9618376";>local
-IP address</a>, and <a
-href="http://epic.org/privacy/cookies/flash.html";>storing their own
-cookies</a>. It is possible to use a LiveCD, like <a
-href="https://amnesia.boum.org/";>The (Amnesic) Incognito Live System</a>
-that creates a secure, transparent proxy to protect you from proxy bypass,
-however issues with local IP address discovery and Flash cookies still
-remain.  </p>
+Youtube et les sites semblables nÃcessitent l'utilisation de plugin comme
+Flash.  Les plugins fonctionnent indÃpendamment de Firefox et sont
+susceptibles d'effectuer des actions sensibles pour la prÃservation de votre
+anonymat. Par exemple, ils peuvent <a href="http://decloak.net";>passer outre
+la configuration du proxy</a>, trouver <a
+href="http://forums.sun.com/thread.jspa?threadID=5162138&amp;messageID=9618376";>votre
+adresse IP locale</a> et <a
+href="http://epic.org/privacy/cookies/flash.html";>stocker leurs propres
+cookies</a>. Il est possible d'utiliser un LiveCD comme <a
+href="https://amnesia.boum.org/";>le systÃme Live (Amnesic) Incognito</a> qui
+met en place un proxy transparent vous mettant à l'abri de tout dÃbordement
+de proxy. A noter toutefois, que les problÃmes de dÃcouverte d'adresse IP
+locale et des cookies Flash ne sont pas rÃglÃs par cette mÃthode.  </p>
 
 <p>
 
@@ -358,10 +358,10 @@
 
 <p>
 
-There are a few known security issues with Torbutton (all of which are due
-to <a href="design/index.html#FirefoxBugs">unfixed Firefox security
-bugs</a>).  However, most of these relate to fingerprinting issues, as
-opposed to outright anonymity leaks.
+Il existe peu de failles de sÃcurità connues qui concernent Torbutton
+(toutes sont dues à <a href="design/index.html#FirefoxBugs">des bugs de
+sÃcurità de Firefox non rÃsolus</a>).  NÃanmoins, la majorità d'entre elles
+sont des problÃmes d'empreinte, complÃtement opposÃes aux fuites d'anonymat.
 
 </p>
 

Modified: website/trunk/torbutton/fr/index.wml
===================================================================
--- website/trunk/torbutton/fr/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/torbutton/fr/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -55,34 +55,33 @@
 </script>
 
 <h2>Torbutton</h2>
-<hr /> <strong>Current version:</strong><version-torbutton><br/> <br/>
-<strong>Authors:</strong> Mike Perry &amp; Scott Squires<br/> <br/>
-<strong>Install:</strong> Click to <a
+<hr /> <strong>Version actuelle:</strong><version-torbutton><br/> <br/>
+<strong>Auteurs:</strong> Mike Perry &amp; Scott Squires<br/> <br/>
+<strong>Installation:</strong> Cliquez sur <a
 href="http://www.torproject.org/torbutton/torbutton-current.xpi";
-hash="<version-hash-torbutton>" onclick="return install(event);">install
-from this website</a> or <a
-href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail";>install
-from Mozilla's Add-On site</a><br/> <strong>Past Releases:</strong> <a
-href="releases/">Local</a><br/> <strong>Developer Documentation:</strong> <a
-href="design/">Torbutton Design Document</a> and <a
-href="design/MozillaBrownBag.pdf">Slides (Not actively updated)</a><br/>
-<strong>Extras:</strong> Google search plugins for <a href="/jsreq.html"
-title="Ref: 14938 (googleCA)"
+hash="<version-hash-torbutton>" onclick="return install(event);">ce lien
+pour installer à partir du site web</a> ou <a
+href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail";>installer
+depuis le site Mozilla Add-On</a><br/> <strong>Versions
+prÃcÃdentes:</strong> <a href="releases/">Locale</a><br/>
+<strong>Documentation DÃveloppeur:</strong> <a href="design/">Document de
+spÃcification</a> and <a href="design/MozillaBrownBag.pdf">Diaporama (Pas
+forcÃment à jour)</a><br/> <strong>Extras:</strong> Plugins de recherche
+Google pour <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
 onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return
-false">Google CA</a>, and <a href="/jsreq.html" title="Ref: 14938
-(googleCA)"
+false">Google CA</a>, et <a href="/jsreq.html" title="Ref: 14938 (googleCA)"
 onClick="addOpenSearch('googleuk_web','png','General','14445','g');return
-false">Google UK</a>.  <br/> <strong>Source:</strong> You can <a
-href="https://gitweb.torproject.org/torbutton.git";>browse the repository</a>
-or simply unzip the xpi.  <br/> <strong>Bug Reports:</strong> <a
-href="https://trac.torproject.org/projects/tor/report/14";>Torproject
+false">Google UK</a>.  <br/> <strong>Code source:</strong> Vous pouvez <a
+href="https://gitweb.torproject.org/torbutton.git";>naviguer sur le dÃpÃt</a>
+ou simplement dÃcompresser le xpi.  <br/> <strong>Rapports de Bug:</strong>
+<a href="https://trac.torproject.org/projects/tor/report/14";>Torproject
 trac</a><br/> <strong>Documents:</strong> <b>[</b> <a href="<page
 torbutton/faq>">FAQ</a> <b>|</b> <a
 href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/CHANGELOG";>changelog</a>
 <b>|</b> <a
-href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/LICENSE";>license</a>
+href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/LICENSE";>licence</a>
 <b>|</b> <a
-href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/CREDITS";>credits</a>
+href="https://gitweb.torproject.org/torbutton.git/blob_plain/HEAD:/src/CREDITS";>crÃdits</a>
 <b>]</b><br/> <br/>
 
 <p>

Modified: website/trunk/uk/index.wml
===================================================================
--- website/trunk/uk/index.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/uk/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -68,15 +68,13 @@
 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="<wiki>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) Ñ ÐÐÐ ÐÐÐÐÐÐÑÑÑÐÐÐÑ ÐÑÐÐÐÑÐÐÑÑÑÑ, ÑÐÑÑ
 ÐÑÑÑÑÑ Ñ ÐÐÐÐÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐÑÑÑ ÐÐÑÐÑÑÑ ÐÐÑÐÐÐ ÐÐÑÐÑÐÐÑ ÑÑÐÑÑÐÑ ÐÑÐ
@@ -91,11 +89,11 @@
 <ul>
 <li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
 compatibility issues and lets relays defend themselves from connection
-floods.  Read the <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>full
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
 announcement</a> for the list of changes.</li>
 <li>29 ÐÐÑÐÐÐÑ 2010: Tor ÐÐÐÑÑÐÐÑ ÐÐÐÐÐÐÑÑ Ñ ÐÑÐÐÑÐÑÑ ÐÐÐÐ ÐÑÐ ÑÐÐÐ ÐÑÐÐÐÑÐÐÐÑ
-ÐÑÐÐÑÐÑÐÐÐÐÑÑÑ. ÐÑÐÑÐÑÐÐÑÐ <a href = "https://www.torproject.org/press/2010-03-25-tor-store-press-release.html.en";> ÐÑÐÑ ÐÐÐÑÐ </ a> ÐÐÑ
+ÐÑÐÐÑÐÑÐÐÐÐÑÑÑ. ÐÑÐÑÐÑÐÐÑÐ <a href = "<page
+press/2010-03-25-performance-roadmap-press-release>"> ÐÑÐÑ ÐÐÐÑÐ </ a> ÐÐÑ
 ÐÑÑÐÐÐÐÐÑ ÐÐÐÐÐÐÐÐÑ ÑÐÑÐÑÐÐÑÑÑ.</li>
 <li><b> ÐÐ ÐÐÑÐÐÐÐ ÑÑÐÐÑÐÐ ÐÐÐÐÑ ÑÐÐÐÑÐÑÑÐ ÑÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐÐÐÐ
 ÑÑÐÐÐÑÑÐÐÐÐÑ. </ b> ÐÐÑÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÑÑÑ ÐÐÑÑÐÐÐÐÐÐÐ Ñ ÐÐÐÐÐÑÑÑÐ ÑÑÐÑÑÐÑÐ Ñ

Modified: website/trunk/zh-cn/bridges.wml
===================================================================
--- website/trunk/zh-cn/bridges.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/zh-cn/bridges.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -31,12 +31,12 @@
 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>.
+href="<wiki>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>
@@ -123,8 +123,8 @@
 Toräç</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 />
+href="<wiki>TorFAQ#Imsupposedtoeditmytorrc.Whatdoesthatmean">edit your torrc
+file</a> to be just these four lines:<br />
 <pre><code>
 SocksPort 0
 ORPort 443
@@ -138,8 +138,8 @@
 
 <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>.
+href="<wiki>TorFAQ#Myfirewallonlyallowsafewoutgoingports.">some complex port
+forwarding</a>.
 </p>
 
 <p>

Modified: website/trunk/zh-cn/contact.wml
===================================================================
--- website/trunk/zh-cn/contact.wml	2010-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/zh-cn/contact.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -35,7 +35,7 @@
 <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>
+href="<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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/zh-cn/download.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -228,12 +228,11 @@
 <li>
 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.
+<a href="<wiki>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-08-23 16:45:00 UTC (rev 23024)
+++ website/trunk/zh-cn/index.wml	2010-08-23 17:53:08 UTC (rev 23025)
@@ -56,11 +56,10 @@
 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>
+href="<wiki>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>
@@ -73,8 +72,7 @@
 <ul>
 <li>02 May 2010: Tor 0.2.1.26 released as stable.  Fixes yet more OpenSSL
 compatibility issues and lets relays defend themselves from connection
-floods.  Read the <a
-href="https://blog.torproject.org/blog/tor-02126-stable-released";>full
+floods.  Read the <a href="<blog>tor-02126-stable-released">full
 announcement</a> for the list of changes.</li>
 <li>29 March 2010: Tor and Printfection announce The Tor Store.  More details
 are available in the <a href="<page