tor-commits

Download

tor-commits@lists.torproject.org

1 participants
213390 discussions

[torspec/master] Move xxx-bridge-disbursement to ideas/old: bridgedb spec supersedes it.
by nickm＠torproject.org 02 Mar '11

02 Mar '11

commit 414f29fd2f2083e44908ceebda44955cb22f0ddb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 2 01:02:36 2011 -0500 Move xxx-bridge-disbursement to ideas/old: bridgedb spec supersedes it. --- proposals/ideas/old/xxx-bridge-disbursement.txt | 174 +++++++++++++++++++++++ proposals/ideas/xxx-bridge-disbursement.txt | 174 ----------------------- 2 files changed, 174 insertions(+), 174 deletions(-) diff --git a/proposals/ideas/old/xxx-bridge-disbursement.txt b/proposals/ideas/old/xxx-bridge-disbursement.txt new file mode 100644 index 0000000..6c9a3c7 --- /dev/null +++ b/proposals/ideas/old/xxx-bridge-disbursement.txt @@ -0,0 +1,174 @@ + +How to hand out bridges. + +Divide bridges into 'strategies' as they come in. Do this uniformly +at random for now. + +For each strategy, we'll hand out bridges in a different way to +clients. This document describes two strategies: email-based and +IP-based. + +0. Notation: + + HMAC(k,v) : an HMAC of v using the key k. + + A|B: The string A concatenated with the string B. + + +1. Email-based. + + Goal: bootstrap based on one or more popular email service's sybil + prevention algorithms. + + + Parameters: + HMAC -- an HMAC function + P -- a time period + K -- the number of bridges to send in a period. + + Setup: Generate two nonces, N and M. + + As bridges arrive, put them into a ring according to HMAC(N,ID) + where ID is the bridges's identity digest. + + Divide time into divisions of length P. + + When we get an email: + + If it's not from a supported email service, reject it. + + If we already sent a response to that email address (normalized) + in this period, send _exactly_ the same response. + + If it is from a supported service, generate X = HMAC(M,PS|E) where E + is the lowercased normalized email address for the user, and + where PS is the start of the currrent period. Send + the first K bridges in the ring after point X. + + [If we want to make sure that repeat queries are given exactly the + same results, then we can't let the ring change during the + time period. For a long time period like a month, that's quite a + hassle. How about instead just keeping a replay cache of addresses + that have been answered, and sending them a "sorry, you already got + your addresses for the time period; perhaps you should try these + other fine distribution strategies while you wait?" response? This + approach would also resolve the "Make sure you can't construct a + distinct address to match an existing one" note below. -RD] + + [I think, if we get a replay, we need to send back the same + answer as we did the first time, not say "try again." + Otherwise we need to worry that an attacker can keep people + from getting bridges by preemtively asking for them, + or that an attacker may force them to prove they haven't + gotten any bridges by asking. -NM] + + [While we're at it, if we do the replay cache thing and don't need + repeatable answers, we could just pick K random answers from the + pool. Is it beneficial that a bridge user who knows about a clump of + nodes will be sharing them with other users who know about a similar + (overlapping) clump? One good aspect is against an adversary who + learns about a clump this way and watches those bridges to learn + other users and discover *their* bridges: he doesn't learn about + as many new bridges as he might if they were randomly distributed. + A drawback is against an adversary who happens to pick two email + addresses in P that include overlapping answers: he can measure + the difference in clumps and estimate how quickly the bridge pool + is growing. -RD] + + [Random is one more darn thing to implement; rings are already + there. -NM] + + [If we make the period P be mailbox-specific, and make it a random + value around some mean, then we make it harder for an attacker to + know when to try using his small army of gmail addresses to gather + another harvest. But we also make it harder for users to know when + they can try again. -RD] + + [Letting the users know about when they can try again seems + worthwhile. Otherwise users and attackers will all probe and + probe and probe until they get an answer. No additional + security will be achieved, but bandwidth will be lost. -NM] + + To normalize an email address: + Start with the RFC822 address. Consider only the mailbox {???} + portion of the address (username@domain). Put this into lowercase + ascii. + + Questions: + What to do with weird character encodings? Look up the RFC. + + Notes: + Make sure that you can't force a single email address to appear + in lots of different ways. IOW, if nickm(a)freehaven.net and + NICKM(a)freehaven.net aren't treated the same, then I can get lots + more bridges than I should. + + Make sure you can't construct a distinct address to match an + existing one. IOW, if we treat nickm@X and nickm@Y as the same + user, then anybody can register nickm@Z and use it to tell which + bridges nickm@X got (or would get). + + Make sure that we actually check headers so we can't be trivially + used to spam people. + + +2. IP-based. + + Goal: avoid handing out all the bridges to users in a similar IP + space and time. + + Parameters: + + T_Flush -- how long it should take a user on a single network to + see a whole cluster of bridges. + + N_C + + K -- the number of bridges we hand out in response to a single + request. + + Setup: using an AS map or a geoip map or some other flawed input + source, divide IP space into "areas" such that surveying a large + collection of "areas" is hard. For v0, use /24 address blocks. + + Group areas into N_C clusters. + + Generate secrets L, M, N. + + Set the period P such that P*(bridges-per-cluster/K) = T_flush. + Don't set P to greater than a week, or less than three hours. + + When we get a bridge: + + Based on HMAC(L,ID), assign the bridge to a cluster. Within each + cluster, keep the bridges in a ring based on HMAC(M,ID). + + [Should we re-sort the rings for each new time period, so the ring + for a given cluster is based on HMAC(M,PS|ID)? -RD] + + When we get a connection: + + If it's http, redirect it to https. + + Let area be the incoming IP network. Let PS be the current + period. Compute X = HMAC(N, PS|area). Return the next K bridges + in the ring after X. + + [Don't we want to compute C = HMAC(key, area) to learn what cluster + to answer from, and then X = HMAC(key, PS|area) to pick a point in + that ring? -RD] + + + Need to clarify that some HMACs are for rings, and some are for + partitions. How rings scale is clear. How do we grow the number of + partitions? Looking at successive bits from the HMAC output is one way. + +3. Open issues + + Denial of service attacks + A good view of network topology + +at some point we should learn some reliability stats on our bridges. when +we say above 'give out k bridges', we might give out 2 reliable ones and +k-2 others. we count around the ring the same way we do now, to find them. + diff --git a/proposals/ideas/xxx-bridge-disbursement.txt b/proposals/ideas/xxx-bridge-disbursement.txt deleted file mode 100644 index 6c9a3c7..0000000 --- a/proposals/ideas/xxx-bridge-disbursement.txt +++ /dev/null @@ -1,174 +0,0 @@ - -How to hand out bridges. - -Divide bridges into 'strategies' as they come in. Do this uniformly -at random for now. - -For each strategy, we'll hand out bridges in a different way to -clients. This document describes two strategies: email-based and -IP-based. - -0. Notation: - - HMAC(k,v) : an HMAC of v using the key k. - - A|B: The string A concatenated with the string B. - - -1. Email-based. - - Goal: bootstrap based on one or more popular email service's sybil - prevention algorithms. - - - Parameters: - HMAC -- an HMAC function - P -- a time period - K -- the number of bridges to send in a period. - - Setup: Generate two nonces, N and M. - - As bridges arrive, put them into a ring according to HMAC(N,ID) - where ID is the bridges's identity digest. - - Divide time into divisions of length P. - - When we get an email: - - If it's not from a supported email service, reject it. - - If we already sent a response to that email address (normalized) - in this period, send _exactly_ the same response. - - If it is from a supported service, generate X = HMAC(M,PS|E) where E - is the lowercased normalized email address for the user, and - where PS is the start of the currrent period. Send - the first K bridges in the ring after point X. - - [If we want to make sure that repeat queries are given exactly the - same results, then we can't let the ring change during the - time period. For a long time period like a month, that's quite a - hassle. How about instead just keeping a replay cache of addresses - that have been answered, and sending them a "sorry, you already got - your addresses for the time period; perhaps you should try these - other fine distribution strategies while you wait?" response? This - approach would also resolve the "Make sure you can't construct a - distinct address to match an existing one" note below. -RD] - - [I think, if we get a replay, we need to send back the same - answer as we did the first time, not say "try again." - Otherwise we need to worry that an attacker can keep people - from getting bridges by preemtively asking for them, - or that an attacker may force them to prove they haven't - gotten any bridges by asking. -NM] - - [While we're at it, if we do the replay cache thing and don't need - repeatable answers, we could just pick K random answers from the - pool. Is it beneficial that a bridge user who knows about a clump of - nodes will be sharing them with other users who know about a similar - (overlapping) clump? One good aspect is against an adversary who - learns about a clump this way and watches those bridges to learn - other users and discover *their* bridges: he doesn't learn about - as many new bridges as he might if they were randomly distributed. - A drawback is against an adversary who happens to pick two email - addresses in P that include overlapping answers: he can measure - the difference in clumps and estimate how quickly the bridge pool - is growing. -RD] - - [Random is one more darn thing to implement; rings are already - there. -NM] - - [If we make the period P be mailbox-specific, and make it a random - value around some mean, then we make it harder for an attacker to - know when to try using his small army of gmail addresses to gather - another harvest. But we also make it harder for users to know when - they can try again. -RD] - - [Letting the users know about when they can try again seems - worthwhile. Otherwise users and attackers will all probe and - probe and probe until they get an answer. No additional - security will be achieved, but bandwidth will be lost. -NM] - - To normalize an email address: - Start with the RFC822 address. Consider only the mailbox {???} - portion of the address (username@domain). Put this into lowercase - ascii. - - Questions: - What to do with weird character encodings? Look up the RFC. - - Notes: - Make sure that you can't force a single email address to appear - in lots of different ways. IOW, if nickm(a)freehaven.net and - NICKM(a)freehaven.net aren't treated the same, then I can get lots - more bridges than I should. - - Make sure you can't construct a distinct address to match an - existing one. IOW, if we treat nickm@X and nickm@Y as the same - user, then anybody can register nickm@Z and use it to tell which - bridges nickm@X got (or would get). - - Make sure that we actually check headers so we can't be trivially - used to spam people. - - -2. IP-based. - - Goal: avoid handing out all the bridges to users in a similar IP - space and time. - - Parameters: - - T_Flush -- how long it should take a user on a single network to - see a whole cluster of bridges. - - N_C - - K -- the number of bridges we hand out in response to a single - request. - - Setup: using an AS map or a geoip map or some other flawed input - source, divide IP space into "areas" such that surveying a large - collection of "areas" is hard. For v0, use /24 address blocks. - - Group areas into N_C clusters. - - Generate secrets L, M, N. - - Set the period P such that P*(bridges-per-cluster/K) = T_flush. - Don't set P to greater than a week, or less than three hours. - - When we get a bridge: - - Based on HMAC(L,ID), assign the bridge to a cluster. Within each - cluster, keep the bridges in a ring based on HMAC(M,ID). - - [Should we re-sort the rings for each new time period, so the ring - for a given cluster is based on HMAC(M,PS|ID)? -RD] - - When we get a connection: - - If it's http, redirect it to https. - - Let area be the incoming IP network. Let PS be the current - period. Compute X = HMAC(N, PS|area). Return the next K bridges - in the ring after X. - - [Don't we want to compute C = HMAC(key, area) to learn what cluster - to answer from, and then X = HMAC(key, PS|area) to pick a point in - that ring? -RD] - - - Need to clarify that some HMACs are for rings, and some are for - partitions. How rings scale is clear. How do we grow the number of - partitions? Looking at successive bits from the HMAC output is one way. - -3. Open issues - - Denial of service attacks - A good view of network topology - -at some point we should learn some reliability stats on our bridges. when -we say above 'give out k bridges', we might give out 2 reliable ones and -k-2 others. we count around the ring the same way we do now, to find them. -

1 0

[torspec/master] Move xxx-auto-update.txt to ideas/old: Thandy superseded it.
by nickm＠torproject.org 02 Mar '11

02 Mar '11

commit 0673b27e6d8547daa5ed062507358b78df439ac7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 2 01:00:01 2011 -0500 Move xxx-auto-update.txt to ideas/old: Thandy superseded it. --- proposals/ideas/old/xxx-auto-update.txt | 39 +++++++++++++++++++++++++++++++ proposals/ideas/xxx-auto-update.txt | 39 ------------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/proposals/ideas/old/xxx-auto-update.txt b/proposals/ideas/old/xxx-auto-update.txt new file mode 100644 index 0000000..dc9a857 --- /dev/null +++ b/proposals/ideas/old/xxx-auto-update.txt @@ -0,0 +1,39 @@ + +Notes on an auto updater: + +steve wants a "latest" symlink so he can always just fetch that. + +roger worries that this will exacerbate the "what version are you +using?" "latest." problem. + +weasel suggests putting the latest recommended version in dns. then +we don't have to hit the website. it's got caching, it's lightweight, +it scales. just put it in a TXT record or something. + +but, no dnssec. + +roger suggests a file on the https website that lists the latest +recommended version (or filename or url or something like that). + +(steve seems to already be doing this with xerobank. he additionally +suggests a little blurb that can be displayed to the user to describe +what's new.) + +how to verify you're getting the right file? +a) it's https. +b) ship with a signing key, and use some openssl functions to verify. +c) both + +andrew reminds us that we have a "recommended versions" line in the +consensus directory already. + +if only we had some way to point out the "latest stable recommendation" +from this list. we could list it first, or something. + +the recommended versions line also doesn't take into account which +packages are available -- e.g. on Windows one version might be the best +available, and on OS X it might be a different one. + +aren't there existing solutions to this? surely there is a beautiful, +efficient, crypto-correct auto updater lib out there. even for windows. + diff --git a/proposals/ideas/xxx-auto-update.txt b/proposals/ideas/xxx-auto-update.txt deleted file mode 100644 index dc9a857..0000000 --- a/proposals/ideas/xxx-auto-update.txt +++ /dev/null @@ -1,39 +0,0 @@ - -Notes on an auto updater: - -steve wants a "latest" symlink so he can always just fetch that. - -roger worries that this will exacerbate the "what version are you -using?" "latest." problem. - -weasel suggests putting the latest recommended version in dns. then -we don't have to hit the website. it's got caching, it's lightweight, -it scales. just put it in a TXT record or something. - -but, no dnssec. - -roger suggests a file on the https website that lists the latest -recommended version (or filename or url or something like that). - -(steve seems to already be doing this with xerobank. he additionally -suggests a little blurb that can be displayed to the user to describe -what's new.) - -how to verify you're getting the right file? -a) it's https. -b) ship with a signing key, and use some openssl functions to verify. -c) both - -andrew reminds us that we have a "recommended versions" line in the -consensus directory already. - -if only we had some way to point out the "latest stable recommendation" -from this list. we could list it first, or something. - -the recommended versions line also doesn't take into account which -packages are available -- e.g. on Windows one version might be the best -available, and on OS X it might be a different one. - -aren't there existing solutions to this? surely there is a beautiful, -efficient, crypto-correct auto updater lib out there. even for windows. -

1 0

[torspec/master] fix a typo in proposal 117
by nickm＠torproject.org 02 Mar '11

02 Mar '11

commit a38bc188819f43e0c3cce8bd8e360c45964f2065 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 2 00:37:55 2011 -0500 fix a typo in proposal 117 --- proposals/117-ipv6-exits.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/proposals/117-ipv6-exits.txt b/proposals/117-ipv6-exits.txt index 00cd7ce..fe458ce 100644 --- a/proposals/117-ipv6-exits.txt +++ b/proposals/117-ipv6-exits.txt @@ -155,7 +155,7 @@ Contents Tor instance and may expose attacks against the anonymity of Tor users. - Tor avoid this potential problem entirely MAPADDRESS must always + To avoid this potential problem entirely MAPADDRESS must always generate the Global, Subnet, and Interface IDs randomly for each request. It is also highly suggested that explicitly specifying an IPv6 source address instead of the wildcard address not be supported

1 0

[torspec/master] Give torspec repo a .gitignore file
by nickm＠torproject.org 02 Mar '11

02 Mar '11

commit 1918d157879c6c1fa701b61e2930f9f9ab3af5c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 2 00:39:02 2011 -0500 Give torspec repo a .gitignore file --- proposals/.gitignore | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/proposals/.gitignore b/proposals/.gitignore new file mode 100644 index 0000000..bbec461 --- /dev/null +++ b/proposals/.gitignore @@ -0,0 +1,4 @@ +# editor junk +*~ +.#* +\#*#

1 0

[torspec/master] Cautiously update status of proposals 149, 169, 174, 176, 177.
by nickm＠torproject.org 02 Mar '11

02 Mar '11

commit b0cd43c6afb6937b41b5caa69205d30ac8408bc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 2 00:53:24 2011 -0500 Cautiously update status of proposals 149,169,174,176,177. --- proposals/000-index.txt | 20 ++++++++++---------- proposals/149-using-netinfo-data.txt | 2 +- proposals/169-eliminating-renegotiation.txt | 3 ++- proposals/174-optimistic-data-server.txt | 2 +- proposals/176-revising-handshake.txt | 2 +- proposals/177-flag-abstention.txt | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index ebeeb90..48ec6a8 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -69,7 +69,7 @@ Proposals by number: 146 Add new flag to reflect long-term stability [OPEN] 147 Eliminate the need for v2 directories in generating v3 directories [ACCEPTED] 148 Stream end reasons from the client side should be uniform [CLOSED] -149 Using data from NETINFO cells [OPEN] +149 Using data from NETINFO cells [DRAFT] 150 Exclude Exit Nodes from a circuit [CLOSED] 151 Improving Tor Path Selection [FINISHED] 152 Optionally allow exit from single-hop circuits [CLOSED] @@ -89,15 +89,15 @@ Proposals by number: 166 Including Network Statistics in Extra-Info Documents [ACCEPTED] 167 Vote on network parameters in consensus [CLOSED] 168 Reduce default circuit window [OPEN] -169 Eliminate TLS renegotiation for the Tor connection handshake [DRAFT] +169 Eliminate TLS renegotiation for the Tor connection handshake [SUPERSEDED] 170 Configuration options regarding circuit building [DRAFT] 171 Separate streams across circuits by connection metadata [OPEN] 172 GETINFO controller option for circuit information [ACCEPTED] 173 GETINFO Option Expansion [ACCEPTED] -174 Optimistic Data for Tor: Server Side [OPEN] +174 Optimistic Data for Tor: Server Side [ACCEPTED] 175 Automatically promoting Tor clients to nodes [DRAFT] -176 Proposed version-3 link handshake for Tor [DRAFT] -177 Abstaining from votes on individual flags [DRAFT] +176 Proposed version-3 link handshake for Tor [OPEN] +177 Abstaining from votes on individual flags [OPEN] 178 Require majority of authorities to vote for consensus parameters [DRAFT] @@ -109,11 +109,9 @@ Proposals by status: 133 Incorporate Unreachable ORs into the Tor Network 141 Download server descriptors on demand 144 Increase the diversity of circuits by detecting nodes belonging the same provider - 169 Eliminate TLS renegotiation for the Tor connection handshake [for 0.2.2] + 149 Using data from NETINFO cells [for 0.2.1.x] 170 Configuration options regarding circuit building 175 Automatically promoting Tor clients to nodes - 176 Proposed version-3 link handshake for Tor [for 0.2.3] - 177 Abstaining from votes on individual flags 178 Require majority of authorities to vote for consensus parameters NEEDS-REVISION: 131 Help users to verify they are using Tor @@ -121,7 +119,6 @@ Proposals by status: 143 Improvements of Distributed Storage for Tor Hidden Service Descriptors [for 0.2.1.x] 145 Separate "suitable as a guard" from "suitable as a new guard" [for 0.2.1.x] 146 Add new flag to reflect long-term stability [for 0.2.1.x] - 149 Using data from NETINFO cells [for 0.2.1.x] 156 Tracking blocked ports on the client side [for 0.2.?] 158 Clients download consensus + microdescriptors 159 Exit Scanning @@ -131,7 +128,8 @@ Proposals by status: 165 Easy migration for voting authority sets 168 Reduce default circuit window [for 0.2.2] 171 Separate streams across circuits by connection metadata - 174 Optimistic Data for Tor: Server Side + 176 Proposed version-3 link handshake for Tor [for 0.2.3] + 177 Abstaining from votes on individual flags ACCEPTED: 110 Avoiding infinite length circuits [for 0.2.1.x] [in 0.2.1.3-alpha] 117 IPv6 exits [for 0.2.1.x] @@ -142,6 +140,7 @@ Proposals by status: 166 Including Network Statistics in Extra-Info Documents [for 0.2.2] 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion + 174 Optimistic Data for Tor: Server Side META: 000 Index of Tor Proposals 001 The Tor Proposal Process @@ -187,6 +186,7 @@ Proposals by status: 124 Blocking resistant TLS certificate usage 153 Automatic software update protocol 154 Automatic Software Update Protocol + 169 Eliminate TLS renegotiation for the Tor connection handshake DEAD: 100 Tor Unreliable Datagram Extension Proposal 115 Two Hop Paths diff --git a/proposals/149-using-netinfo-data.txt b/proposals/149-using-netinfo-data.txt index 8bf8375..cf2945a 100644 --- a/proposals/149-using-netinfo-data.txt +++ b/proposals/149-using-netinfo-data.txt @@ -2,7 +2,7 @@ Filename: 149-using-netinfo-data.txt Title: Using data from NETINFO cells Author: Nick Mathewson Created: 2-Jul-2008 -Status: Open +Status: Draft Target: 0.2.1.x Overview diff --git a/proposals/169-eliminating-renegotiation.txt b/proposals/169-eliminating-renegotiation.txt index 6311124..fe4cd58 100644 --- a/proposals/169-eliminating-renegotiation.txt +++ b/proposals/169-eliminating-renegotiation.txt @@ -2,8 +2,9 @@ Filename: 169-eliminating-renegotiation.txt Title: Eliminate TLS renegotiation for the Tor connection handshake Author: Nick Mathewson Created: 27-Jan-2010 -Status: Draft +Status: Superseded Target: 0.2.2 +Superseded-By: 176 1. Overview diff --git a/proposals/174-optimistic-data-server.txt b/proposals/174-optimistic-data-server.txt index d97c45e..88616b8 100644 --- a/proposals/174-optimistic-data-server.txt +++ b/proposals/174-optimistic-data-server.txt @@ -2,7 +2,7 @@ Filename: 174-optimistic-data-server.txt Title: Optimistic Data for Tor: Server Side Author: Ian Goldberg Created: 2-Aug-2010 -Status: Open +Status: Accepted Overview: diff --git a/proposals/176-revising-handshake.txt b/proposals/176-revising-handshake.txt index db7ea4a..2215cf5 100644 --- a/proposals/176-revising-handshake.txt +++ b/proposals/176-revising-handshake.txt @@ -2,7 +2,7 @@ Filename: 176-revising-handshake.txt Title: Proposed version-3 link handshake for Tor Author: Nick Mathewson Created: 31-Jan-2011 -Status: Draft +Status: Open Target: 0.2.3 Supersedes: 169 diff --git a/proposals/177-flag-abstention.txt b/proposals/177-flag-abstention.txt index 0b4a9ba..46d68e6 100644 --- a/proposals/177-flag-abstention.txt +++ b/proposals/177-flag-abstention.txt @@ -2,7 +2,7 @@ Filename: 177-flag-abstention.txt Title: Abstaining from votes on individual flags Author: Nick Mathewson Created: 14 Feb 2011 -Status: Draft +Status: Open Overview:

1 0

[tor/master] remove tls related hash table code
by nickm＠torproject.org 01 Mar '11

01 Mar '11

commit 49de5431d53b4515d48a0f1c76fc53f3306f5d11 Author: Gladys Shufflebottom <> Date: Sat Feb 19 22:01:42 2011 -0500 remove tls related hash table code --- changes/tls-hash | 3 +++ src/common/tortls.c | 28 ++-------------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/changes/tls-hash b/changes/tls-hash new file mode 100644 index 0000000..a34083a --- /dev/null +++ b/changes/tls-hash @@ -0,0 +1,3 @@ + o Code simplifications and refactoring: + - Use SSL_get_app_data to map SSL objects to tortls_t objects: there's + no need for a hash table. diff --git a/src/common/tortls.c b/src/common/tortls.c index ca9e92c..20a0e77 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -58,7 +58,6 @@ #include "util.h" #include "torlog.h" #include "container.h" -#include "ht.h" #include <string.h> /* Enable the "v2" TLS handshake. @@ -108,7 +107,6 @@ typedef struct tor_tls_context_t { * accessed from within tortls.c. */ struct tor_tls_t { - HT_ENTRY(tor_tls_t) node; tor_tls_context_t *context; /** A link to the context object for this tls. */ SSL *ssl; /**< An OpenSSL SSL object. */ int socket; /**< The underlying file descriptor for this TLS connection. */ @@ -171,25 +169,12 @@ tor_tls_entry_hash(const tor_tls_t *a) #endif } -/** Map from SSL* pointers to tor_tls_t objects using those pointers. - */ -static HT_HEAD(tlsmap, tor_tls_t) tlsmap_root = HT_INITIALIZER(); - -HT_PROTOTYPE(tlsmap, tor_tls_t, node, tor_tls_entry_hash, - tor_tls_entries_eq) -HT_GENERATE(tlsmap, tor_tls_t, node, tor_tls_entry_hash, - tor_tls_entries_eq, 0.6, malloc, realloc, free) - /** Helper: given a SSL* pointer, return the tor_tls_t object using that * pointer. */ static INLINE tor_tls_t * tor_tls_get_by_ssl(const SSL *ssl) { - tor_tls_t search, *result; - memset(&search, 0, sizeof(search)); - search.ssl = (SSL*)ssl; - result = HT_FIND(tlsmap, &tlsmap_root, &search); - return result; + return SSL_get_app_data(ssl); } static void tor_tls_context_decref(tor_tls_context_t *ctx); @@ -466,10 +451,6 @@ tor_tls_free_all(void) client_tls_context = NULL; tor_tls_context_decref(ctx); } - if (!HT_EMPTY(&tlsmap_root)) { - log_warn(LD_MM, "Still have entries in the tlsmap at shutdown."); - } - HT_CLEAR(tlsmap, &tlsmap_root); #ifdef V2_HANDSHAKE_CLIENT if (CLIENT_CIPHER_DUMMIES) tor_free(CLIENT_CIPHER_DUMMIES); @@ -1085,7 +1066,7 @@ tor_tls_new(int sock, int isServer) tor_free(result); return NULL; } - HT_INSERT(tlsmap, &tlsmap_root, result); + SSL_set_app_data(result->ssl, result); SSL_set_bio(result->ssl, bio, bio); tor_tls_context_incref(context); result->context = context; @@ -1196,14 +1177,9 @@ tor_tls_is_server(tor_tls_t *tls) void tor_tls_free(tor_tls_t *tls) { - tor_tls_t *removed; if (!tls) return; tor_assert(tls->ssl); - removed = HT_REMOVE(tlsmap, &tlsmap_root, tls); - if (!removed) { - log_warn(LD_BUG, "Freeing a TLS that was not in the ssl->tls map."); - } #ifdef SSL_set_tlsext_host_name SSL_set_tlsext_host_name(tls->ssl, NULL); #endif

1 0

[tor/master] Avoid spurious bwhist parsing failures
by nickm＠torproject.org 01 Mar '11

01 Mar '11

commit 6b7408178bf9cb3864cec14408d78e8374f26b68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 1 17:08:02 2011 -0500 Avoid spurious bwhist parsing failures This should fix a bug that special ran into, where if your state file didn't record period maxima, it would never decide that it had successfully parsed itself unless you got lucky with your uninitialized-variable values. This patch also tries to improve error messags in the case where a maximum value legitimately doesn't parse. --- src/or/rephist.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 3f4a704..61ae2c3 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1602,18 +1602,24 @@ rep_hist_load_bwhist_state_section(bw_array_t *b, b->cur_obs_time = start; b->next_period = start + NUM_SECS_BW_SUM_INTERVAL; SMARTLIST_FOREACH_BEGIN(s_values, const char *, cp) { + const char *maxstr = NULL; v = tor_parse_uint64(cp, 10, 0, UINT64_MAX, &ok, NULL); if (have_maxima) { - const char *maxstr = smartlist_get(s_maxima, cp_sl_idx); + maxstr = smartlist_get(s_maxima, cp_sl_idx); mv = tor_parse_uint64(maxstr, 10, 0, UINT64_MAX, &ok_m, NULL); mv *= NUM_SECS_ROLLING_MEASURE; } else { /* No maxima known; guess average rate to be conservative. */ mv = v / s_interval; } - if (!ok || !ok_m) { + if (!ok) { retval = -1; - log_notice(LD_HIST, "Could not parse '%s' into a number.'", cp); + log_notice(LD_HIST, "Could not parse value '%s' into a number.'",cp); + } + if (maxstr && !ok_m) { + retval = -1; + log_notice(LD_HIST, "Could not parse maximum '%s' into a number.'", + maxstr); } if (start < now) {

1 0

[tor/master] Merge remote branch 'origin/maint-0.2.2'
by nickm＠torproject.org 01 Mar '11

01 Mar '11

commit d60a7c2f8d139d2b2dfd71780dae8a86489cec49 Merge: 42c1a47 6b74081 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 1 17:15:37 2011 -0500 Merge remote branch 'origin/maint-0.2.2' src/or/rephist.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --combined src/or/rephist.c index f34c5b6,61ae2c3..0c5f937 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@@ -7,14 -7,13 +7,14 @@@ * \brief Basic history and "reputation" functionality to remember * which servers have worked in the past, how much bandwidth we've * been using, which ports we tend to want, and so on; further, - * exit port statistics and cell statistics. + * exit port statistics, cell statistics, and connection statistics. **/ #include "or.h" #include "circuitlist.h" #include "circuituse.h" #include "config.h" +#include "nodelist.h" #include "rephist.h" #include "router.h" #include "routerlist.h" @@@ -580,7 -579,7 +580,7 @@@ rep_hist_dump_stats(time_t now, int sev size_t len; int ret; unsigned long upt, downt; - routerinfo_t *r; + const node_t *node; rep_history_clean(now - get_options()->RephistTrackTime); @@@ -594,8 -593,8 +594,8 @@@ digestmap_iter_get(orhist_it, &digest1, &or_history_p); or_history = (or_history_t*) or_history_p; - if ((r = router_get_by_digest(digest1))) - name1 = r->nickname; + if ((node = node_get_by_id(digest1)) && node_get_nickname(node)) + name1 = node_get_nickname(node); else name1 = "(unknown)"; base16_encode(hexdigest1, sizeof(hexdigest1), digest1, DIGEST_LEN); @@@ -625,8 -624,8 +625,8 @@@ lhist_it = digestmap_iter_next(or_history->link_history_map, lhist_it)) { digestmap_iter_get(lhist_it, &digest2, &link_history_p); - if ((r = router_get_by_digest(digest2))) - name2 = r->nickname; + if ((node = node_get_by_id(digest2)) && node_get_nickname(node)) + name2 = node_get_nickname(node); else name2 = "(unknown)"; @@@ -757,7 -756,7 +757,7 @@@ rep_hist_record_mtbf_data(time_t now, i base16_encode(dbuf, sizeof(dbuf), digest, DIGEST_LEN); if (missing_means_down && hist->start_of_run && - !router_get_by_digest(digest)) { + !router_get_by_id_digest(digest)) { /* We think this relay is running, but it's not listed in our * routerlist. Somehow it fell out without telling us it went * down. Complain and also correct it. */ @@@ -872,32 -871,28 +872,32 @@@ rep_hist_get_router_stability_doc(time_ } DIGESTMAP_FOREACH(history_map, id, or_history_t *, hist) { - routerinfo_t *ri; + const node_t *node; char dbuf[BASE64_DIGEST_LEN+1]; char header_buf[512]; char *info; digest_to_base64(dbuf, id); - ri = router_get_by_digest(id); - if (ri) { - char *ip = tor_dup_ip(ri->addr); + node = node_get_by_id(id); + if (node) { + char ip[INET_NTOA_BUF_LEN+1]; char tbuf[ISO_TIME_LEN+1]; - format_iso_time(tbuf, ri->cache_info.published_on); + time_t published = node_get_published_on(node); + node_get_address_string(node,ip,sizeof(ip)); + if (published > 0) + format_iso_time(tbuf, published); + else + strlcpy(tbuf, "???", sizeof(tbuf)); tor_snprintf(header_buf, sizeof(header_buf), "router %s %s %s\n" "published %s\n" "relevant-flags %s%s%s\n" "declared-uptime %ld\n", - dbuf, ri->nickname, ip, + dbuf, node_get_nickname(node), ip, tbuf, - ri->is_running ? "Running " : "", - ri->is_valid ? "Valid " : "", - ri->is_hibernating ? "Hibernating " : "", - ri->uptime); - tor_free(ip); + node->is_running ? "Running " : "", + node->is_valid ? "Valid " : "", + node->ri && node->ri->is_hibernating ? "Hibernating " : "", + node_get_declared_uptime(node)); } else { tor_snprintf(header_buf, sizeof(header_buf), "router %s {no descriptor}\n", dbuf); @@@ -1607,18 -1602,24 +1607,24 @@@ rep_hist_load_bwhist_state_section(bw_a b->cur_obs_time = start; b->next_period = start + NUM_SECS_BW_SUM_INTERVAL; SMARTLIST_FOREACH_BEGIN(s_values, const char *, cp) { + const char *maxstr = NULL; v = tor_parse_uint64(cp, 10, 0, UINT64_MAX, &ok, NULL); if (have_maxima) { - const char *maxstr = smartlist_get(s_maxima, cp_sl_idx); + maxstr = smartlist_get(s_maxima, cp_sl_idx); mv = tor_parse_uint64(maxstr, 10, 0, UINT64_MAX, &ok_m, NULL); mv *= NUM_SECS_ROLLING_MEASURE; } else { /* No maxima known; guess average rate to be conservative. */ mv = v / s_interval; } - if (!ok || !ok_m) { + if (!ok) { retval = -1; - log_notice(LD_HIST, "Could not parse '%s' into a number.'", cp); + log_notice(LD_HIST, "Could not parse value '%s' into a number.'",cp); + } + if (maxstr && !ok_m) { + retval = -1; + log_notice(LD_HIST, "Could not parse maximum '%s' into a number.'", + maxstr); } if (start < now) { @@@ -1676,13 -1677,10 +1682,13 @@@ rep_hist_load_state(or_state_t *state, /*********************************************************************/ +typedef struct predicted_port_t { + uint16_t port; + time_t time; +} predicted_port_t; + /** A list of port numbers that have been used recently. */ static smartlist_t *predicted_ports_list=NULL; -/** The corresponding most recently used time for each port. */ -static smartlist_t *predicted_ports_times=NULL; /** We just got an application request for a connection with * port <b>port</b>. Remember it for the future, so we can keep @@@ -1691,11 -1689,14 +1697,11 @@@ static void add_predicted_port(time_t now, uint16_t port) { - /* XXXX we could just use uintptr_t here, I think. */ - uint16_t *tmp_port = tor_malloc(sizeof(uint16_t)); - time_t *tmp_time = tor_malloc(sizeof(time_t)); - *tmp_port = port; - *tmp_time = now; - rephist_total_alloc += sizeof(uint16_t) + sizeof(time_t); - smartlist_add(predicted_ports_list, tmp_port); - smartlist_add(predicted_ports_times, tmp_time); + predicted_port_t *pp = tor_malloc(sizeof(predicted_port_t)); + pp->port = port; + pp->time = now; + rephist_total_alloc += sizeof(*pp); + smartlist_add(predicted_ports_list, pp); } /** Initialize whatever memory and structs are needed for predicting @@@ -1706,6 -1707,7 +1712,6 @@@ static voi predicted_ports_init(void) { predicted_ports_list = smartlist_create(); - predicted_ports_times = smartlist_create(); add_predicted_port(time(NULL), 80); /* add one to kickstart us */ } @@@ -1715,11 -1717,12 +1721,11 @@@ static void predicted_ports_free(void) { - rephist_total_alloc -= smartlist_len(predicted_ports_list)*sizeof(uint16_t); - SMARTLIST_FOREACH(predicted_ports_list, char *, cp, tor_free(cp)); + rephist_total_alloc -= + smartlist_len(predicted_ports_list)*sizeof(predicted_port_t); + SMARTLIST_FOREACH(predicted_ports_list, predicted_port_t *, + pp, tor_free(pp)); smartlist_free(predicted_ports_list); - rephist_total_alloc -= smartlist_len(predicted_ports_times)*sizeof(time_t); - SMARTLIST_FOREACH(predicted_ports_times, char *, cp, tor_free(cp)); - smartlist_free(predicted_ports_times); } /** Remember that <b>port</b> has been asked for as of time <b>now</b>. @@@ -1729,17 -1732,24 +1735,17 @@@ void rep_hist_note_used_port(time_t now, uint16_t port) { - int i; - uint16_t *tmp_port; - time_t *tmp_time; - tor_assert(predicted_ports_list); - tor_assert(predicted_ports_times); if (!port) /* record nothing */ return; - for (i = 0; i < smartlist_len(predicted_ports_list); ++i) { - tmp_port = smartlist_get(predicted_ports_list, i); - tmp_time = smartlist_get(predicted_ports_times, i); - if (*tmp_port == port) { - *tmp_time = now; + SMARTLIST_FOREACH_BEGIN(predicted_ports_list, predicted_port_t *, pp) { + if (pp->port == port) { + pp->time = now; return; } - } + } SMARTLIST_FOREACH_END(pp); /* it's not there yet; we need to add it */ add_predicted_port(now, port); } @@@ -1748,28 -1758,36 +1754,28 @@@ * we'll want to make connections to the same port in the future. */ #define PREDICTED_CIRCS_RELEVANCE_TIME (60*60) -/** Return a pointer to the list of port numbers that +/** Return a newly allocated pointer to a list of uint16_t * for ports that * are likely to be asked for in the near future. - * - * The caller promises not to mess with it. */ smartlist_t * rep_hist_get_predicted_ports(time_t now) { - int i; - uint16_t *tmp_port; - time_t *tmp_time; - + smartlist_t *out = smartlist_create(); tor_assert(predicted_ports_list); - tor_assert(predicted_ports_times); /* clean out obsolete entries */ - for (i = 0; i < smartlist_len(predicted_ports_list); ++i) { - tmp_time = smartlist_get(predicted_ports_times, i); - if (*tmp_time + PREDICTED_CIRCS_RELEVANCE_TIME < now) { - tmp_port = smartlist_get(predicted_ports_list, i); - log_debug(LD_CIRC, "Expiring predicted port %d", *tmp_port); - smartlist_del(predicted_ports_list, i); - smartlist_del(predicted_ports_times, i); - rephist_total_alloc -= sizeof(uint16_t)+sizeof(time_t); - tor_free(tmp_port); - tor_free(tmp_time); - i--; + SMARTLIST_FOREACH_BEGIN(predicted_ports_list, predicted_port_t *, pp) { + if (pp->time + PREDICTED_CIRCS_RELEVANCE_TIME < now) { + log_debug(LD_CIRC, "Expiring predicted port %d", pp->port); + + rephist_total_alloc -= sizeof(predicted_port_t); + tor_free(pp); + SMARTLIST_DEL_CURRENT(predicted_ports_list, pp); + } else { + smartlist_add(out, tor_memdup(&pp->port, sizeof(uint16_t))); } - } - return predicted_ports_list; + } SMARTLIST_FOREACH_END(pp); + return out; } /** The user asked us to do a resolve. Rather than keeping track of @@@ -2005,9 -2023,7 +2011,9 @@@ rep_hist_exit_stats_term(void tor_free(exit_streams); } -/** Helper for qsort: compare two ints. */ +/** Helper for qsort: compare two ints. Does not handle overflow properly, + * but works fine for sorting an array of port numbers, which is what we use + * it for. */ static int _compare_int(const void *x, const void *y) { @@@ -2255,6 -2271,7 +2261,6 @@@ typedef struct circ_buffer_stats_t uint32_t processed_cells; double mean_num_cells_in_queue; double mean_time_cells_in_queue; - uint32_t local_circ_id; } circ_buffer_stats_t; /** Holds stats. */ @@@ -2277,9 -2294,9 +2283,9 @@@ rep_hist_buffer_stats_add_circ(circuit_ return; if (!circuits_for_buffer_stats) circuits_for_buffer_stats = smartlist_create(); - start_of_interval = circ->timestamp_created > - start_of_buffer_stats_interval ? - circ->timestamp_created : + start_of_interval = (circ->timestamp_created.tv_sec > + start_of_buffer_stats_interval) ? + circ->timestamp_created.tv_sec : start_of_buffer_stats_interval; interval_length = (int) (end_of_interval - start_of_interval); stat = tor_malloc_zero(sizeof(circ_buffer_stats_t)); @@@ -2445,227 -2462,6 +2451,227 @@@ rep_hist_buffer_stats_write(time_t now return start_of_buffer_stats_interval + WRITE_STATS_INTERVAL; } +/*** Connection statistics ***/ + +/** Start of the current connection stats interval or 0 if we're not + * collecting connection statistics. */ +static time_t start_of_conn_stats_interval; + +/** Initialize connection stats. */ +void +rep_hist_conn_stats_init(time_t now) +{ + start_of_conn_stats_interval = now; +} + +/* Count connections that we read and wrote less than these many bytes + * from/to as below threshold. */ +#define BIDI_THRESHOLD 20480 + +/* Count connections that we read or wrote at least this factor as many + * bytes from/to than we wrote or read to/from as mostly reading or + * writing. */ +#define BIDI_FACTOR 10 + +/* Interval length in seconds for considering read and written bytes for + * connection stats. */ +#define BIDI_INTERVAL 10 + +/* Start of next BIDI_INTERVAL second interval. */ +static time_t bidi_next_interval = 0; + +/* Number of connections that we read and wrote less than BIDI_THRESHOLD + * bytes from/to in BIDI_INTERVAL seconds. */ +static uint32_t below_threshold = 0; + +/* Number of connections that we read at least BIDI_FACTOR times more + * bytes from than we wrote to in BIDI_INTERVAL seconds. */ +static uint32_t mostly_read = 0; + +/* Number of connections that we wrote at least BIDI_FACTOR times more + * bytes to than we read from in BIDI_INTERVAL seconds. */ +static uint32_t mostly_written = 0; + +/* Number of connections that we read and wrote at least BIDI_THRESHOLD + * bytes from/to, but not BIDI_FACTOR times more in either direction in + * BIDI_INTERVAL seconds. */ +static uint32_t both_read_and_written = 0; + +/* Entry in a map from connection ID to the number of read and written + * bytes on this connection in a BIDI_INTERVAL second interval. */ +typedef struct bidi_map_entry_t { + HT_ENTRY(bidi_map_entry_t) node; + uint64_t conn_id; /**< Connection ID */ + size_t read; /**< Number of read bytes */ + size_t written; /**< Number of written bytes */ +} bidi_map_entry_t; + +/** Map of OR connections together with the number of read and written + * bytes in the current BIDI_INTERVAL second interval. */ +static HT_HEAD(bidimap, bidi_map_entry_t) bidi_map = + HT_INITIALIZER(); + +static int +bidi_map_ent_eq(const bidi_map_entry_t *a, const bidi_map_entry_t *b) +{ + return a->conn_id == b->conn_id; +} + +static unsigned +bidi_map_ent_hash(const bidi_map_entry_t *entry) +{ + return (unsigned) entry->conn_id; +} + +HT_PROTOTYPE(bidimap, bidi_map_entry_t, node, bidi_map_ent_hash, + bidi_map_ent_eq); +HT_GENERATE(bidimap, bidi_map_entry_t, node, bidi_map_ent_hash, + bidi_map_ent_eq, 0.6, malloc, realloc, free); + +static void +bidi_map_free(void) +{ + bidi_map_entry_t **ptr, **next, *ent; + for (ptr = HT_START(bidimap, &bidi_map); ptr; ptr = next) { + ent = *ptr; + next = HT_NEXT_RMV(bidimap, &bidi_map, ptr); + tor_free(ent); + } + HT_CLEAR(bidimap, &bidi_map); +} + +/** Reset counters for conn statistics. */ +void +rep_hist_reset_conn_stats(time_t now) +{ + start_of_conn_stats_interval = now; + below_threshold = 0; + mostly_read = 0; + mostly_written = 0; + both_read_and_written = 0; + bidi_map_free(); +} + +/** Stop collecting connection stats in a way that we can re-start doing + * so in rep_hist_conn_stats_init(). */ +void +rep_hist_conn_stats_term(void) +{ + rep_hist_reset_conn_stats(0); +} + +/** We read <b>num_read</b> bytes and wrote <b>num_written</b> from/to OR + * connection <b>conn_id</b> in second <b>when</b>. If this is the first + * observation in a new interval, sum up the last observations. Add bytes + * for this connection. */ +void +rep_hist_note_or_conn_bytes(uint64_t conn_id, size_t num_read, + size_t num_written, time_t when) +{ + if (!start_of_conn_stats_interval) + return; + /* Initialize */ + if (bidi_next_interval == 0) + bidi_next_interval = when + BIDI_INTERVAL; + /* Sum up last period's statistics */ + if (when >= bidi_next_interval) { + bidi_map_entry_t **ptr, **next, *ent; + for (ptr = HT_START(bidimap, &bidi_map); ptr; ptr = next) { + ent = *ptr; + if (ent->read + ent->written < BIDI_THRESHOLD) + below_threshold++; + else if (ent->read >= ent->written * BIDI_FACTOR) + mostly_read++; + else if (ent->written >= ent->read * BIDI_FACTOR) + mostly_written++; + else + both_read_and_written++; + next = HT_NEXT_RMV(bidimap, &bidi_map, ptr); + tor_free(ent); + } + while (when >= bidi_next_interval) + bidi_next_interval += BIDI_INTERVAL; + log_info(LD_GENERAL, "%d below threshold, %d mostly read, " + "%d mostly written, %d both read and written.", + below_threshold, mostly_read, mostly_written, + both_read_and_written); + } + /* Add this connection's bytes. */ + if (num_read > 0 || num_written > 0) { + bidi_map_entry_t *entry, lookup; + lookup.conn_id = conn_id; + entry = HT_FIND(bidimap, &bidi_map, &lookup); + if (entry) { + entry->written += num_written; + entry->read += num_read; + } else { + entry = tor_malloc_zero(sizeof(bidi_map_entry_t)); + entry->conn_id = conn_id; + entry->written = num_written; + entry->read = num_read; + HT_INSERT(bidimap, &bidi_map, entry); + } + } +} + +/** Return a newly allocated string containing the connection statistics + * until <b>now</b>, or NULL if we're not collecting conn stats. */ +char * +rep_hist_format_conn_stats(time_t now) +{ + char *result, written[ISO_TIME_LEN+1]; + + if (!start_of_conn_stats_interval) + return NULL; /* Not initialized. */ + + format_iso_time(written, now); + tor_asprintf(&result, "conn-bi-direct %s (%d s) %d,%d,%d,%d\n", + written, + (unsigned) (now - start_of_conn_stats_interval), + below_threshold, + mostly_read, + mostly_written, + both_read_and_written); + return result; +} + +/** If 24 hours have passed since the beginning of the current conn stats + * period, write conn stats to $DATADIR/stats/conn-stats (possibly + * overwriting an existing file) and reset counters. Return when we would + * next want to write conn stats or 0 if we never want to write. */ +time_t +rep_hist_conn_stats_write(time_t now) +{ + char *statsdir = NULL, *filename = NULL, *str = NULL; + + if (!start_of_conn_stats_interval) + return 0; /* Not initialized. */ + if (start_of_conn_stats_interval + WRITE_STATS_INTERVAL > now) + goto done; /* Not ready to write */ + + /* Generate history string. */ + str = rep_hist_format_conn_stats(now); + + /* Reset counters. */ + rep_hist_reset_conn_stats(now); + + /* Try to write to disk. */ + statsdir = get_datadir_fname("stats"); + if (check_private_dir(statsdir, CPD_CREATE) < 0) { + log_warn(LD_HIST, "Unable to create stats/ directory!"); + goto done; + } + filename = get_datadir_fname2("stats", "conn-stats"); + if (write_str_to_file(filename, str, 0) < 0) + log_warn(LD_HIST, "Unable to write conn stats to disk!"); + + done: + tor_free(str); + tor_free(filename); + tor_free(statsdir); + return start_of_conn_stats_interval + WRITE_STATS_INTERVAL; +} + /** Free all storage held by the OR/link history caches, by the * bandwidth history arrays, by the port history, or by statistics . */ void @@@ -2680,6 -2476,5 +2686,6 @@@ rep_hist_free_all(void tor_free(exit_streams); built_last_stability_doc_at = 0; predicted_ports_free(); + bidi_map_free(); }

1 0

[tor/maint-0.2.2] Avoid spurious bwhist parsing failures
by nickm＠torproject.org 01 Mar '11

01 Mar '11

1 0

r24285: {translation} updated website templates for transifex (in translation/trunk/projects/website/po/templates: about docs press projects)
by Runa Sandvik 01 Mar '11

01 Mar '11

Author: runa Date: 2011-03-01 17:06:10 +0000 (Tue, 01 Mar 2011) New Revision: 24285 Modified: translation/trunk/projects/website/po/templates/about/2-medium.overview.pot translation/trunk/projects/website/po/templates/about/3-low.contributors.pot translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot translation/trunk/projects/website/po/templates/docs/1-high.bridges.pot translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot translation/trunk/projects/website/po/templates/docs/3-low.debian.pot translation/trunk/projects/website/po/templates/press/3-low.inthemedia.pot translation/trunk/projects/website/po/templates/press/3-low.press.pot translation/trunk/projects/website/po/templates/projects/3-low.projects.pot translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot Log: updated website templates for transifex Modified: translation/trunk/projects/website/po/templates/about/2-medium.overview.pot =================================================================== --- translation/trunk/projects/website/po/templates/about/2-medium.overview.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/about/2-medium.overview.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-12-26 14:32+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -17,66 +17,66 @@ "Content-Transfer-Encoding: 8bit\n" #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/overview.wml:8 +#: /home/runa/tor/website/about/en/overview.wml:8 msgid "" "<a href=\"<page index>\">Home » </a> <a href=\"<page about/overview>" "\">About » </a>" msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/overview.wml:12 +#: /home/runa/tor/website/about/en/overview.wml:12 msgid "<a name=\"overview\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/transifex/website/about/en/overview.wml:13 +#: /home/runa/tor/website/about/en/overview.wml:13 msgid "<a class=\"anchor\" href=\"#overview\">Tor: Overview</a>" msgstr "" #. type: Content of: <div><div><div><h3> -#: /home/runa/transifex/website/about/en/overview.wml:16 +#: /home/runa/tor/website/about/en/overview.wml:16 msgid "Topics" msgstr "" #. type: Content of: <div><div><div><ul><li> -#: /home/runa/transifex/website/about/en/overview.wml:18 +#: /home/runa/tor/website/about/en/overview.wml:18 msgid "<a href=\"<page about/overview>#overview\">Overview</a>" msgstr "" #. type: Content of: <div><div><div><ul><li> -#: /home/runa/transifex/website/about/en/overview.wml:19 +#: /home/runa/tor/website/about/en/overview.wml:19 msgid "<a href=\"<page about/overview>#whyweneedtor\">Why we need Tor</a>" msgstr "" #. type: Content of: <div><div><div><ul><li> -#: /home/runa/transifex/website/about/en/overview.wml:20 +#: /home/runa/tor/website/about/en/overview.wml:20 msgid "<a href=\"<page about/overview>#thesolution\">The Solution</a>" msgstr "" #. type: Content of: <div><div><div><ul><li> -#: /home/runa/transifex/website/about/en/overview.wml:21 +#: /home/runa/tor/website/about/en/overview.wml:21 msgid "<a href=\"<page about/overview>#hiddenservices\">Hidden services</a>" msgstr "" #. type: Content of: <div><div><div><ul><li> -#: /home/runa/transifex/website/about/en/overview.wml:22 +#: /home/runa/tor/website/about/en/overview.wml:22 msgid "" "<a href=\"<page about/overview>#stayinganonymous\">Staying anonymous</a>" msgstr "" #. type: Content of: <div><div><div><ul><li> -#: /home/runa/transifex/website/about/en/overview.wml:23 +#: /home/runa/tor/website/about/en/overview.wml:23 msgid "<a href=\"<page about/overview>#thefutureoftor\">The future of Tor</a>" msgstr "" #. END SIDEBAR #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/overview.wml:28 +#: /home/runa/tor/website/about/en/overview.wml:28 msgid "<hr>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:31 +#: /home/runa/tor/website/about/en/overview.wml:31 msgid "" "Tor is a network of virtual tunnels that allows people and groups to improve " "their privacy and security on the Internet. It also enables software " @@ -87,7 +87,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:41 +#: /home/runa/tor/website/about/en/overview.wml:41 msgid "" "Individuals use Tor to keep websites from tracking them and their family " "members, or to connect to news sites, instant messaging services, or the " @@ -99,7 +99,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:52 +#: /home/runa/tor/website/about/en/overview.wml:52 msgid "" "Journalists use Tor to communicate more safely with whistleblowers and " "dissidents. Non-governmental organizations (NGOs) use Tor to allow their " @@ -109,7 +109,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:60 +#: /home/runa/tor/website/about/en/overview.wml:60 msgid "" "Groups such as Indymedia recommend Tor for safeguarding their members' " "online privacy and security. Activist groups like the Electronic Frontier " @@ -123,7 +123,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:73 +#: /home/runa/tor/website/about/en/overview.wml:73 msgid "" "A branch of the U.S. Navy uses Tor for open source intelligence gathering, " "and one of its teams used Tor while deployed in the Middle East recently. " @@ -133,7 +133,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:81 +#: /home/runa/tor/website/about/en/overview.wml:81 msgid "" "The variety of people who use Tor is actually <a href=\"http://freehaven.net/" "doc/fc03/econymics.pdf\">part of what makes it so secure</a>. Tor hides you " @@ -143,17 +143,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/overview.wml:89 +#: /home/runa/tor/website/about/en/overview.wml:89 msgid "<a name=\"whyweneedtor\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/transifex/website/about/en/overview.wml:90 +#: /home/runa/tor/website/about/en/overview.wml:90 msgid "<a class=\"anchor\" href=\"#whyweneedtor\">Why we need Tor</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:93 +#: /home/runa/tor/website/about/en/overview.wml:93 msgid "" "Using Tor protects you against a common form of Internet surveillance known " "as \"traffic analysis.\" Traffic analysis can be used to infer who is " @@ -169,7 +169,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:108 +#: /home/runa/tor/website/about/en/overview.wml:108 msgid "" "How does traffic analysis work? Internet data packets have two parts: a data " "payload and a header used for routing. The data payload is whatever is " @@ -181,7 +181,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:118 +#: /home/runa/tor/website/about/en/overview.wml:118 msgid "" "A basic problem for the privacy minded is that the recipient of your " "communications can see that you sent it by looking at headers. So can " @@ -192,7 +192,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:127 +#: /home/runa/tor/website/about/en/overview.wml:127 msgid "" "But there are also more powerful kinds of traffic analysis. Some attackers " "spy on multiple parts of the Internet and use sophisticated statistical " @@ -203,24 +203,24 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/overview.wml:135 +#: /home/runa/tor/website/about/en/overview.wml:135 msgid "<a name=\"thesolution\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/transifex/website/about/en/overview.wml:136 +#: /home/runa/tor/website/about/en/overview.wml:136 msgid "" "<a class=\"anchor\" href=\"#thesolution\">The solution: a distributed, " "anonymous network</a>" msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/overview.wml:137 +#: /home/runa/tor/website/about/en/overview.wml:137 msgid "<img src=\"$(IMGROOT)/htw1.png\" alt=\"How Tor works\">" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:140 +#: /home/runa/tor/website/about/en/overview.wml:140 msgid "" "Tor helps to reduce the risks of both simple and sophisticated traffic " "analysis by distributing your transactions over several places on the " @@ -234,12 +234,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:151 -msgid "<img alt=\"Tor circuit step one\" src=\"$(IMGROOT)/htw1.png\">" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:154 +#: /home/runa/tor/website/about/en/overview.wml:152 msgid "" "To create a private network pathway with Tor, the user's software or client " "incrementally builds a circuit of encrypted connections through relays on " @@ -252,12 +247,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:164 +#: /home/runa/tor/website/about/en/overview.wml:162 msgid "<img alt=\"Tor circuit step two\" src=\"$(IMGROOT)/htw2.png\">" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:167 +#: /home/runa/tor/website/about/en/overview.wml:165 msgid "" "Once a circuit has been established, many kinds of data can be exchanged and " "several different sorts of software applications can be deployed over the " @@ -268,7 +263,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:177 +#: /home/runa/tor/website/about/en/overview.wml:175 msgid "" "For efficiency, the Tor software uses the same circuit for connections that " "happen within the same ten minutes or so. Later requests are given a new " @@ -276,22 +271,22 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:183 +#: /home/runa/tor/website/about/en/overview.wml:181 msgid "<img alt=\"Tor circuit step three\" src=\"$(IMGROOT)/htw3.png\">" msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/overview.wml:186 +#: /home/runa/tor/website/about/en/overview.wml:184 msgid "<a name=\"hiddenservices\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/transifex/website/about/en/overview.wml:187 +#: /home/runa/tor/website/about/en/overview.wml:185 msgid "<a class=\"anchor\" href=\"#hiddenservices\">Hidden services</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:190 +#: /home/runa/tor/website/about/en/overview.wml:188 msgid "" "Tor also makes it possible for users to hide their locations while offering " "various kinds of services, such as web publishing or an instant messaging " @@ -306,17 +301,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/overview.wml:203 +#: /home/runa/tor/website/about/en/overview.wml:201 msgid "<a name=\"stayinganonymous\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/transifex/website/about/en/overview.wml:204 +#: /home/runa/tor/website/about/en/overview.wml:202 msgid "<a class=\"anchor\" href=\"#stayinganonymous\">Staying anonymous</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:207 +#: /home/runa/tor/website/about/en/overview.wml:205 msgid "" "Tor can't solve all anonymity problems. It focuses only on protecting the " "transport of data. You need to use protocol-specific support software if " @@ -326,7 +321,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:216 +#: /home/runa/tor/website/about/en/overview.wml:214 msgid "" "Also, to protect your anonymity, be smart. Don't provide your name or other " "revealing information in web forms. Be aware that, like all anonymizing " @@ -338,17 +333,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/about/en/overview.wml:225 +#: /home/runa/tor/website/about/en/overview.wml:223 msgid "<a name=\"thefutureoftor\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/transifex/website/about/en/overview.wml:226 +#: /home/runa/tor/website/about/en/overview.wml:224 msgid "<a class=\"anchor\" href=\"#thefutureoftor\">The future of Tor</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:229 +#: /home/runa/tor/website/about/en/overview.wml:227 msgid "" "Providing a usable anonymizing network on the Internet today is an ongoing " "challenge. We want software that meets users' needs. We also want to keep " @@ -363,7 +358,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/about/en/overview.wml:243 +#: /home/runa/tor/website/about/en/overview.wml:241 msgid "" "Ongoing trends in law, policy, and technology threaten anonymity as never " "before, undermining our ability to speak and read freely online. These " Modified: translation/trunk/projects/website/po/templates/about/3-low.contributors.pot =================================================================== --- translation/trunk/projects/website/po/templates/about/3-low.contributors.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/about/3-low.contributors.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-01-03 14:39+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -87,8 +87,8 @@ msgid "" "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." +"\"<specblob>proposals/151-path-selection-improvements.txt\">proposal 151</a> " +"as part of Google Summer of Code 2008." msgstr "" #. type: Content of: <div><div><dl><dt> Modified: translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot =================================================================== --- translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/about/3-low.corepeople.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-12 12:19+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -180,7 +180,7 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/corepeople.wml:86 -msgid "Tom Heydt-Benjamin, Researcher" +msgid "Thomas S. Benjamin, Researcher" msgstr "" #. type: Content of: <div><div><dl><dd> @@ -239,11 +239,11 @@ #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/corepeople.wml:107 msgid "" -"Worked during the 2007 Google Summer of Code on <a href=\"<gitblob>doc/spec/" -"proposals/114-distributed-storage.txt\">distributing and securing the " -"publishing and fetching of hidden service descriptors</a>. Currently the " -"primary researcher for our National Science Foundation grant into <a href=" -"\"http://metrics.torproject.org/\">anonymous metrics</a>." +"Worked during the 2007 Google Summer of Code on <a href=" +"\"<specblob>proposals/114-distributed-storage.txt\">distributing and " +"securing the publishing and fetching of hidden service descriptors</a>. " +"Currently the primary researcher for our National Science Foundation grant " +"into <a href=\"http://metrics.torproject.org/\">anonymous metrics</a>." msgstr "" #. type: Content of: <div><div><dl><dt> Modified: translation/trunk/projects/website/po/templates/docs/1-high.bridges.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/1-high.bridges.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/docs/1-high.bridges.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-12 12:20+0000\n" +"POT-Creation-Date: 2011-03-01 16:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -35,8 +35,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/bridges.wml:15 /tmp/D41bBAMkKK.xml:79 -#: /tmp/D41bBAMkKK.xml:102 /tmp/D41bBAMkKK.xml:125 /tmp/D41bBAMkKK.xml:149 +#: /home/runa/tor/website/docs/en/bridges.wml:15 /tmp/mX6VGOF12v.xml:79 +#: /tmp/mX6VGOF12v.xml:102 /tmp/mX6VGOF12v.xml:125 /tmp/mX6VGOF12v.xml:149 msgid "<hr>" msgstr "" @@ -303,8 +303,7 @@ #: /home/runa/tor/website/docs/en/bridges.wml:193 msgid "" "If you would like to learn more about our bridge design from a technical " -"standpoint, please read the <a href=\"<gitblob>doc/spec/bridges-spec.txt" -"\">Tor bridges specification</a>. If you're interested in running an " -"unpublished bridge or other non-standard uses, please do read the " -"specification." +"standpoint, please read the <a href=\"<specblob>bridges-spec.txt\">Tor " +"bridges specification</a>. If you're interested in running an unpublished " +"bridge or other non-standard uses, please do read the specification." msgstr "" Modified: translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/docs/2-medium.documentation.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-12 12:20+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -103,7 +103,7 @@ "href=\"<page docs/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." +"of the legal issues that arise from The Tor Project in the US." msgstr "" #. type: Content of: <div><div><ol><li> @@ -125,14 +125,14 @@ "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 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=\"#MailingLists\">tor-talk mailing list</a> can also be useful." msgstr "" #. type: Content of: <div><div><ol><li> #: /home/runa/tor/website/docs/en/documentation.wml:81 msgid "" -"<a href=\"<blog>\">Tor has a blog now</a>. We try to keep it updated every " -"week or two with the latest news." +"<a href=\"<blog>\">Tor has a blog</a>. We try to keep it updated every week " +"or two with the latest news." msgstr "" #. type: Content of: <div><div><ol><li> @@ -200,9 +200,9 @@ #. type: Content of: <div><div><ol><li> #: /home/runa/tor/website/docs/en/documentation.wml:139 msgid "" -"Learn about the <a href=\"<gitblob>doc/spec/proposals/001-process.txt\">Tor " -"proposal process for changing our design</a>, and look over the <a href=" -"\"<gittree>doc/spec/proposals\">existing proposals</a>." +"Learn about the <a href=\"<specblob>proposals/001-process.txt\">Tor proposal " +"process for changing our design</a>, and look over the <a href=" +"\"<spectree>proposals\">existing proposals</a>." msgstr "" #. type: Content of: <div><div><ol><li> @@ -218,7 +218,7 @@ #: /home/runa/tor/website/docs/en/documentation.wml:153 msgid "" "Once you're up to speed, things will continue to change surprisingly fast. " -"The <a href=\"#MailingLists\">or-dev mailing list</a> is where the complex " +"The <a href=\"#MailingLists\">tor-dev mailing list</a> is where the complex " "discussion happens, and the #tor IRC channel is where the less complex " "discussion happens." msgstr "" @@ -236,35 +236,37 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:164 msgid "" -"The <a href=\"http://archives.seul.org/or/announce/\">or-announce mailing " -"list</a> is a low volume list for announcements of new releases and critical " -"security updates. Everybody should be on this list. There is also an <a " -"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\">RSS feed</" -"a> of or-announce at <a href=\"http://gmane.org\">gmane.org</a>." +"The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" +"announce/\">tor-announce mailing list</a> is a low volume list for " +"announcements of new releases and critical security updates. Everybody " +"should be on this list. There is also an <a href=\"http://rss.gmane.org/" +"gmane.network.onion-routing.announce\">RSS feed</a> of tor-announce at <a " +"href=\"http://gmane.org\">gmane.org</a>." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:170 msgid "" -"The <a href=\"http://archives.seul.org/or/talk/\">or-talk list</a> is where " -"a lot of discussion happens, and is where we send notifications of " -"prerelease versions and release candidates." +"The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk/" +"\">tor-talk list</a> is where a lot of discussion happens, and is where we " +"send notifications of prerelease versions and release candidates." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:173 msgid "" -"The <a href=\"http://archives.seul.org/tor/relays/\">tor-relays list</a> is " -"where discussions about running, configuring, and handling your tor relay " -"happen. If you currently run a relay, or are thinking about doing so, this " -"is the list for you." +"The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" +"relays/\">tor-relays list</a> is where discussions about running, " +"configuring, and handling your tor relay happen. If you currently run a " +"relay, or are thinking about doing so, this is the list for you." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:177 msgid "" -"The <a href=\"http://archives.seul.org/or/dev/\">or-dev list</a> is for " -"posting by developers only, and is very low traffic." +"The <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev/" +"\">tor-dev list</a> is for posting by developers only, and is very low " +"traffic." msgstr "" #. type: Content of: <div><div><ul><li> @@ -278,15 +280,16 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:182 msgid "" -"A list for <a href=\"http://archives.seul.org/or/cvs/\">svn and git commits</" -"a> may be interesting for developers." +"A list for <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/" +"tor-commits/\">svn and git commits</a> may be interesting for developers." msgstr "" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:184 msgid "" -"An automated list for <a href=\"http://archives.seul.org/tor/bugs/\">bug " -"reports from trac</a> may be interesting for users and developers." +"An automated list for <a href=\"https://lists.torproject.org/cgi-bin/mailman/" +"listinfo/tor-bugs/\">bug reports from trac</a> may be interesting for users " +"and developers." msgstr "" #. type: Content of: <div><div> @@ -347,63 +350,57 @@ #. type: Content of: <div><div><ul><li><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:213 -msgid "<a href=\"<gitblob>doc/spec/tor-spec.txt\">Main Tor specification</a>" +msgid "<a href=\"<specblob>tor-spec.txt\">Main Tor specification</a>" msgstr "" #. type: Content of: <div><div><ul><li><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:214 msgid "" -"<a href=\"<gitblob>doc/spec/dir-spec.txt\">Tor version 3 directory server " -"specification</a> (and older <a href=\"<gitblob>doc/spec/dir-spec-v1.txt" -"\">version 1</a> and <a href=\"<gitblob>doc/spec/dir-spec-v2.txt\">version " -"2</a> directory specifications)" +"<a href=\"<specblob>dir-spec.txt\">Tor version 3 directory server " +"specification</a> (and older <a href=\"<specblob>dir-spec-v1.txt\">version " +"1</a> and <a href=\"<specblob>dir-spec-v2.txt\">version 2</a> directory " +"specifications)" msgstr "" #. type: Content of: <div><div><ul><li><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:219 msgid "" -"<a href=\"<gitblob>doc/spec/control-spec.txt\">Tor control protocol " -"specification</a>" +"<a href=\"<specblob>control-spec.txt\">Tor control protocol specification</a>" msgstr "" #. type: Content of: <div><div><ul><li><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:221 -msgid "" -"<a href=\"<gitblob>doc/spec/rend-spec.txt\">Tor rendezvous specification</a>" +msgid "<a href=\"<specblob>rend-spec.txt\">Tor rendezvous specification</a>" msgstr "" #. type: Content of: <div><div><ul><li><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:223 msgid "" -"<a href=\"<gitblob>doc/spec/path-spec.txt\">Tor path selection " -"specification</a>" +"<a href=\"<specblob>path-spec.txt\">Tor path selection specification</a>" msgstr "" #. type: Content of: <div><div><ul><li><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:225 -msgid "" -"<a href=\"<gitblob>doc/spec/address-spec.txt\">Special hostnames in Tor</a>" +msgid "<a href=\"<specblob>address-spec.txt\">Special hostnames in Tor</a>" msgstr "" #. type: Content of: <div><div><ul><li><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:227 msgid "" -"<a href=\"<gitblob>doc/spec/socks-extensions.txt\">Tor's SOCKS support and " +"<a href=\"<specblob>socks-extensions.txt\">Tor's SOCKS support and " "extensions</a>" msgstr "" #. type: Content of: <div><div><ul><li><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:229 -msgid "" -"<a href=\"<gitblob>doc/spec/version-spec.txt\">How Tor version numbers work</" -"a>" +msgid "<a href=\"<specblob>version-spec.txt\">How Tor version numbers work</a>" msgstr "" #. type: Content of: <div><div><ul><li><ul><li> #: /home/runa/tor/website/docs/en/documentation.wml:231 msgid "" -"<a href=\"<gittree>doc/spec/proposals\">In-progress drafts of new " -"specifications and proposed changes</a>" +"<a href=\"<spectree>proposals\">In-progress drafts of new specifications and " +"proposed changes</a>" msgstr "" #. type: Content of: <div><div> @@ -491,7 +488,7 @@ #: /home/runa/tor/website/docs/en/documentation.wml:271 msgid "" "The development branch is <kbd>master</kbd>. The active maintenance " -"branches are <kbd>maint-0.2.0</kbd> and <kbd>maint-0.2.1</kbd>." +"branches are <kbd>maint-0.2.1</kbd> and <kbd>maint-0.2.2</kbd>." msgstr "" #. type: Content of: <div><div><ul><li><ul><li> Modified: translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-12-05 19:13+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -30,7 +30,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/lq8jCyVMh2.xml:1400 +#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/ymYXq8doht.xml:1646 msgid "<hr>" msgstr "" @@ -97,182 +97,224 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:35 +#: /home/runa/tor/website/docs/en/faq.wml:36 msgid "Compilation and Installation:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:37 +#: /home/runa/tor/website/docs/en/faq.wml:38 msgid "<a href=\"#HowUninstallTor\">How do I uninstall Tor?</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:38 +#: /home/runa/tor/website/docs/en/faq.wml:39 msgid "" "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:40 +#: /home/runa/tor/website/docs/en/faq.wml:41 +msgid "" +"<a href=\"#GetTor\">Your website is blocked in my country. How do I download " +"Tor?</a>" +msgstr "" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:43 msgid "<a href=\"#CompileTorWindows\">How do I compile Tor under Windows?</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:41 +#: /home/runa/tor/website/docs/en/faq.wml:44 msgid "" "<a href=\"#VirusFalsePositives\">Why does my Tor executable appear to have a " "virus or spyware?</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:43 +#: /home/runa/tor/website/docs/en/faq.wml:46 msgid "" "<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:46 +#: /home/runa/tor/website/docs/en/faq.wml:49 msgid "Running Tor:" msgstr "" +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:51 +msgid "" +"<a href=\"#torrc\">I'm supposed to \"edit my torrc\". What does that mean?</" +"a>" +msgstr "" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:53 +msgid "<a href=\"#Logs\">How do I set up logging, or see Tor's logs?</a>" +msgstr "" + #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:48 +#: /home/runa/tor/website/docs/en/faq.wml:57 msgid "Running a Tor client:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:50 +#: /home/runa/tor/website/docs/en/faq.wml:59 msgid "" "<a href=\"#DoesntWork\">I installed Tor and Polipo but it's not working.</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:52 +#: /home/runa/tor/website/docs/en/faq.wml:61 msgid "" "<a href=\"#VidaliaPassword\">Tor/Vidalia prompts for a password at start.</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:54 +#: /home/runa/tor/website/docs/en/faq.wml:63 msgid "" "<a href=\"#ChooseEntryExit\">Can I control which nodes (or country) are " "used for entry/exit?</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:56 +#: /home/runa/tor/website/docs/en/faq.wml:65 msgid "" "<a href=\"#GoogleCaptcha\">Google makes me solve a Captcha or tells me I " "have spyware installed.</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:58 +#: /home/runa/tor/website/docs/en/faq.wml:67 msgid "" "<a href=\"#GmailWarning\">Gmail warns me that my account may have been " "compromised.</a>" msgstr "" +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:69 +msgid "" +"<a href=\"#FirewallPorts\">My firewall only allows a few outgoing ports.</a>" +msgstr "" + #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:62 +#: /home/runa/tor/website/docs/en/faq.wml:73 msgid "Running a Tor relay:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:64 +#: /home/runa/tor/website/docs/en/faq.wml:75 msgid "<a href=\"#RelayFlexible\">How stable does my relay need to be?</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:65 +#: /home/runa/tor/website/docs/en/faq.wml:76 msgid "" "<a href=\"#ExitPolicies\">I'd run a relay, but I don't want to deal with " "abuse issues.</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:67 +#: /home/runa/tor/website/docs/en/faq.wml:78 msgid "" "<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:69 +#: /home/runa/tor/website/docs/en/faq.wml:80 +msgid "<a href=\"#MultipleRelays\">I want to run more than one relay.</a>" +msgstr "" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:81 msgid "<a href=\"#RelayMemory\">Why is my Tor relay using so much memory?</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:70 +#: /home/runa/tor/website/docs/en/faq.wml:82 msgid "<a href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:73 +#: /home/runa/tor/website/docs/en/faq.wml:85 msgid "Running a Tor hidden service:" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:75 +#: /home/runa/tor/website/docs/en/faq.wml:87 msgid "Anonymity and Security:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:77 +#: /home/runa/tor/website/docs/en/faq.wml:89 msgid "<a href=\"#KeyManagement\">Tell me about all the keys Tor uses.</a>" msgstr "" +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:90 +msgid "<a href=\"#EntryGuards\">What are Entry Guards?</a>" +msgstr "" + #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:80 +#: /home/runa/tor/website/docs/en/faq.wml:93 msgid "Alternate designs that we don't do (yet):" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:82 +#: /home/runa/tor/website/docs/en/faq.wml:95 msgid "" "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>" msgstr "" +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:97 +msgid "" +"<a href=\"#TransportIPnotTCP\">You should transport all IP packets, not just " +"TCP packets.</a>" +msgstr "" + #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:86 -msgid "Abuse" +#: /home/runa/tor/website/docs/en/faq.wml:101 +msgid "Abuse:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:88 +#: /home/runa/tor/website/docs/en/faq.wml:103 msgid "" "<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:89 +#: /home/runa/tor/website/docs/en/faq.wml:104 msgid "" "<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:93 +#: /home/runa/tor/website/docs/en/faq.wml:108 msgid "" "For other questions not yet on this version of the FAQ, see the <a href=" "\"<wikifaq>\">wiki FAQ</a> for now." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:96 +#: /home/runa/tor/website/docs/en/faq.wml:111 msgid "<hr> <a id=\"General\"></a> <a id=\"WhatIsTor\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:101 +#: /home/runa/tor/website/docs/en/faq.wml:116 msgid "<a class=\"anchor\" href=\"#WhatIsTor\">What is Tor?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:104 +#: /home/runa/tor/website/docs/en/faq.wml:119 msgid "The name \"Tor\" can refer to several different components." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:108 +#: /home/runa/tor/website/docs/en/faq.wml:123 msgid "" "The Tor software is a program you can run on your computer that helps keep " "you safe on the Internet. Tor protects you by bouncing your communications " @@ -285,26 +327,26 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:119 +#: /home/runa/tor/website/docs/en/faq.wml:134 msgid "" "The Tor Project is a non-profit (charity) organization that maintains and " "develops the Tor software." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:123 +#: /home/runa/tor/website/docs/en/faq.wml:138 msgid "<hr> <a id=\"Torisdifferent\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:126 +#: /home/runa/tor/website/docs/en/faq.wml:141 msgid "" "<a class=\"anchor\" href=\"#Torisdifferent\">How is Tor different from other " "proxies?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:128 +#: /home/runa/tor/website/docs/en/faq.wml:143 msgid "" "A typical proxy provider sets up a server somewhere on the Internet and " "allows you to use it to relay your traffic. This creates a simple, easy to " @@ -320,7 +362,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:141 +#: /home/runa/tor/website/docs/en/faq.wml:156 msgid "" "Simple proxy providers also create a single point of failure. The provider " "knows who you are and where you browse on the Internet. They can see your " @@ -332,7 +374,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:150 +#: /home/runa/tor/website/docs/en/faq.wml:165 msgid "" "Tor passes your traffic through at least 3 different servers before sending " "it on to the destination. Tor does not modify, or even know, what you are " @@ -345,12 +387,12 @@ msgstr "" #. type: Content of: <div><div><p><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:160 +#: /home/runa/tor/website/docs/en/faq.wml:175 msgid "Doesn't the first server see who I am?" msgstr "" #. type: Content of: <div><div><p><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:160 +#: /home/runa/tor/website/docs/en/faq.wml:175 msgid "" "Possibly. A bad first of three servers can see encrypted Tor traffic coming " "from your computer. It still doesn't know who you are and what you are " @@ -361,12 +403,12 @@ msgstr "" #. type: Content of: <div><div><p><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:166 +#: /home/runa/tor/website/docs/en/faq.wml:181 msgid "Can't the third server see my traffic?" msgstr "" #. type: Content of: <div><div><p><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:166 +#: /home/runa/tor/website/docs/en/faq.wml:181 msgid "" "Possibly. A bad third of three servers can see the traffic you sent into " "Tor. It won't know who sent this traffic. If you're using encryption, such " @@ -378,19 +420,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:176 +#: /home/runa/tor/website/docs/en/faq.wml:191 msgid "<hr> <a id=\"CompatibleApplications\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:179 +#: /home/runa/tor/website/docs/en/faq.wml:194 msgid "" "<a class=\"anchor\" href=\"#CompatibleApplications\">What programs can I use " "with Tor?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:183 +#: /home/runa/tor/website/docs/en/faq.wml:197 msgid "" "There are two pieces to \"Torifying\" a program: connection-level anonymity " "and application-level anonymity. Connection-level anonymity focuses on " @@ -406,7 +448,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:197 +#: /home/runa/tor/website/docs/en/faq.wml:211 msgid "" "Most of our work so far has focused on the Firefox web browser. The bundles " "on the <a href=\"<page download/download>\">download page</a> automatically " @@ -416,7 +458,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:206 +#: /home/runa/tor/website/docs/en/faq.wml:220 msgid "" "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 " @@ -428,17 +470,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:217 +#: /home/runa/tor/website/docs/en/faq.wml:231 msgid "<hr> <a id=\"WhyCalledTor\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:220 +#: /home/runa/tor/website/docs/en/faq.wml:234 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:223 +#: /home/runa/tor/website/docs/en/faq.wml:237 msgid "" "Because Tor is the onion routing network. When we were starting the new next-" "generation design and implementation of onion routing in 2001-2002, we would " @@ -449,12 +491,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:233 +#: /home/runa/tor/website/docs/en/faq.wml:247 msgid "(It's also got a fine translation from German and Turkish.)" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:237 +#: /home/runa/tor/website/docs/en/faq.wml:251 msgid "" "Note: even though it originally came from an acronym, Tor is not spelled " "\"TOR\". Only the first letter is capitalized. In fact, we can usually spot " @@ -464,17 +506,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:244 +#: /home/runa/tor/website/docs/en/faq.wml:258 msgid "<hr> <a id=\"Backdoor\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:247 +#: /home/runa/tor/website/docs/en/faq.wml:261 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:250 +#: /home/runa/tor/website/docs/en/faq.wml:264 msgid "" "There is absolutely no backdoor in Tor. Nobody has asked us to put one in, " "and we know some smart lawyers who say that it's unlikely that anybody will " @@ -483,7 +525,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:257 +#: /home/runa/tor/website/docs/en/faq.wml:271 msgid "" "We think that putting a backdoor in Tor would be tremendously irresponsible " "to our users, and a bad precedent for security software in general. If we " @@ -493,7 +535,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:265 +#: /home/runa/tor/website/docs/en/faq.wml:279 msgid "" "But that said, there are still plenty of subtle attacks people might try. " "Somebody might impersonate us, or break into our computers, or something " @@ -506,7 +548,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:277 +#: /home/runa/tor/website/docs/en/faq.wml:291 msgid "" "Also, there might be accidental bugs in Tor that could affect your " "anonymity. We periodically find and fix anonymity-related bugs, so make sure " @@ -514,24 +556,24 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:282 +#: /home/runa/tor/website/docs/en/faq.wml:296 msgid "<hr> <a id=\"DistributingTor\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:285 +#: /home/runa/tor/website/docs/en/faq.wml:299 msgid "" "<a class=\"anchor\" href=\"#DistributingTor\">Can I distribute Tor on my " "magazine's CD?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:289 +#: /home/runa/tor/website/docs/en/faq.wml:302 msgid "Yes." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:293 +#: /home/runa/tor/website/docs/en/faq.wml:306 msgid "" "The Tor software is <a href=\"https://www.fsf.org/\">free software</a>. This " "means we give you the rights to redistribute the Tor software, either " @@ -540,7 +582,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:300 +#: /home/runa/tor/website/docs/en/faq.wml:313 msgid "" "However, if you want to redistribute the Tor software you must follow our <a " "href=\"<gitblob>LICENSE\">LICENSE</a>. Essentially this means that you need " @@ -549,7 +591,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:307 +#: /home/runa/tor/website/docs/en/faq.wml:320 msgid "" "Most people who ask us this question don't want to distribute just the Tor " "software, though. They want to distribute the Tor bundles, which typically " @@ -565,7 +607,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:323 +#: /home/runa/tor/website/docs/en/faq.wml:336 msgid "" "Also, you should make sure not to confuse your readers about what Tor is, " "who makes it, and what properties it provides (and doesn't provide). See our " @@ -573,7 +615,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:329 +#: /home/runa/tor/website/docs/en/faq.wml:342 msgid "" "Lastly, you should realize that we release new versions of the Tor software " "frequently, and sometimes we make backward incompatible changes. So if you " @@ -583,79 +625,79 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:336 +#: /home/runa/tor/website/docs/en/faq.wml:349 msgid "<hr> <a id=\"SupportMail\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:339 +#: /home/runa/tor/website/docs/en/faq.wml:352 msgid "" "<a class=\"anchor\" href=\"#SupportMail\">How can I get an answer to my Tor " "support mail?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:342 +#: /home/runa/tor/website/docs/en/faq.wml:354 msgid "" "There is no official support for Tor. Your best bet is to try the following:" msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:344 +#: /home/runa/tor/website/docs/en/faq.wml:356 msgid "Read through this <a href=\"<page docs/faq>\">FAQ</a>." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:345 +#: /home/runa/tor/website/docs/en/faq.wml:357 msgid "" "Read through the <a href=\"<page docs/documentation>\">documentation</a>." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:346 +#: /home/runa/tor/website/docs/en/faq.wml:358 msgid "" "Read through the <a href=\"http://archives.seul.org/or/talk\">OR-TALK " "Archives</a> and see if your question is already answered." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:349 +#: /home/runa/tor/website/docs/en/faq.wml:361 msgid "" "Join our <a href=\"irc://irc.oftc.net#tor\">irc channel</a> and state the " "issue and wait for help." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:351 +#: /home/runa/tor/website/docs/en/faq.wml:363 msgid "" "Send an email to tor-assistants at torproject.org. These are volunteers who " "may be able to help you but you may not get a response for days." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:357 +#: /home/runa/tor/website/docs/en/faq.wml:368 msgid "" "If you find your answer, please stick around on the IRC channel or the " "mailing list and answer questions from others." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:360 +#: /home/runa/tor/website/docs/en/faq.wml:371 msgid "<hr> <a id=\"WhySlow\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:363 +#: /home/runa/tor/website/docs/en/faq.wml:374 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:366 +#: /home/runa/tor/website/docs/en/faq.wml:377 msgid "There are many reasons why the Tor network is currently slow." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:370 +#: /home/runa/tor/website/docs/en/faq.wml:381 msgid "" "Before we answer, though, you should realize that Tor is never going to be " "blazing fast. Your traffic is bouncing through volunteers' computers in " @@ -665,7 +707,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:378 +#: /home/runa/tor/website/docs/en/faq.wml:389 msgid "" "But that doesn't mean that it can't be improved. The current Tor network is " "quite small compared to the number of people trying to use it, and many of " @@ -674,7 +716,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:385 +#: /home/runa/tor/website/docs/en/faq.wml:396 msgid "" "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 " @@ -682,12 +724,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:392 +#: /home/runa/tor/website/docs/en/faq.wml:403 msgid "What can you do to help?" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:398 +#: /home/runa/tor/website/docs/en/faq.wml:409 msgid "" "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic " "for others</a>. Help make the Tor network large enough that we can handle " @@ -695,7 +737,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:404 +#: /home/runa/tor/website/docs/en/faq.wml:415 msgid "" "<a href=\"<page projects/vidalia>\">Help us make Tor more usable</a>. We " "especially need people to help make it easier to configure your Tor as a " @@ -704,7 +746,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:411 +#: /home/runa/tor/website/docs/en/faq.wml:422 msgid "" "There are some bottlenecks in the current Tor network. Help us design " "experiments to track down and demonstrate where the problems are, and then " @@ -712,7 +754,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:417 +#: /home/runa/tor/website/docs/en/faq.wml:428 msgid "" "There are some steps that individuals can take to improve their Tor " "performance. <a href=\"<wiki>TheOnionRouter/FireFoxTorPerf\">You can " @@ -724,7 +766,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:428 +#: /home/runa/tor/website/docs/en/faq.wml:439 msgid "" "Tor needs some architectural changes too. One important change is to start " "providing <a href=\"#EverybodyARelay\">better service to people who relay " @@ -733,7 +775,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:435 +#: /home/runa/tor/website/docs/en/faq.wml:446 msgid "" "Help do other things so we can do the hard stuff. Please take a moment to " "figure out what your skills and interests are, and then <a href=\"<page " @@ -741,7 +783,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:441 +#: /home/runa/tor/website/docs/en/faq.wml:452 msgid "" "Help find sponsors for Tor. Do you work at a company or government agency " "that uses Tor or has a use for Internet privacy, e.g. to browse the " @@ -752,7 +794,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:450 +#: /home/runa/tor/website/docs/en/faq.wml:461 msgid "" "If you can't help out with any of the above, you can still help out " "individually by <a href=\"<page donate/donate>\">donating a bit of money to " @@ -760,19 +802,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:457 +#: /home/runa/tor/website/docs/en/faq.wml:468 msgid "<hr> <a id=\"Funding\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:460 +#: /home/runa/tor/website/docs/en/faq.wml:471 msgid "" "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with " "more funding?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:464 +#: /home/runa/tor/website/docs/en/faq.wml:474 msgid "" "We have about 1800 relays right now, pushing over 150 MB/s average traffic. " "We have several hundred thousand active users. But the Tor network is not " @@ -780,12 +822,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:470 +#: /home/runa/tor/website/docs/en/faq.wml:480 msgid "There are six main development/maintenance pushes that need attention:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:476 +#: /home/runa/tor/website/docs/en/faq.wml:486 msgid "" "Scalability: We need to keep scaling and decentralizing the Tor architecture " "so it can handle thousands of relays and millions of users. The upcoming " @@ -794,7 +836,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:483 +#: /home/runa/tor/website/docs/en/faq.wml:493 msgid "" "User support: With this many users, a lot of people are asking questions all " "the time, offering to help out with things, and so on. We need good clean " @@ -802,7 +844,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:489 +#: /home/runa/tor/website/docs/en/faq.wml:499 msgid "" "Relay support: the Tor network is run by volunteers, but they still need " "attention with prompt bug fixes, explanations when things go wrong, " @@ -813,7 +855,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:498 +#: /home/runa/tor/website/docs/en/faq.wml:508 msgid "" "Usability: Beyond documentation, we also need to work on usability of the " "software itself. This includes installers, clean GUIs, easy configuration to " @@ -824,7 +866,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:507 +#: /home/runa/tor/website/docs/en/faq.wml:517 msgid "" "Incentives: We need to work on ways to encourage people to configure their " "Tors as relays and exit nodes rather than just clients. <a href=" @@ -833,7 +875,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:514 +#: /home/runa/tor/website/docs/en/faq.wml:524 msgid "" "Research: The anonymous communications field is full of surprises and " "gotchas. In our copious free time, we also help run top anonymity and " @@ -845,7 +887,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:527 +#: /home/runa/tor/website/docs/en/faq.wml:537 msgid "" "We're continuing to move forward on all of these, but at this rate <a href=" "\"#WhySlow\">the Tor network is growing faster than the developers can keep " @@ -854,14 +896,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:535 +#: /home/runa/tor/website/docs/en/faq.wml:545 msgid "" "We are also excited about tackling related problems, such as censorship-" "resistance." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:540 +#: /home/runa/tor/website/docs/en/faq.wml:550 msgid "" "We are proud to have <a href=\"<page about/sponsors>\">sponsorship and " "support</a> from the Omidyar Network, the International Broadcasting Bureau, " @@ -871,7 +913,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:547 +#: /home/runa/tor/website/docs/en/faq.wml:557 msgid "" "However, this support is not enough to keep Tor abreast of changes in the " "Internet privacy landscape. Please <a href=\"<page donate/donate>\">donate</" @@ -880,37 +922,37 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:553 +#: /home/runa/tor/website/docs/en/faq.wml:563 msgid "<a id=\"Metrics\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:554 +#: /home/runa/tor/website/docs/en/faq.wml:564 msgid "" "<a class=\"anchor\" href=\"#Metrics\">How many people use Tor? How many " "relays or exit nodes are there?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:556 +#: /home/runa/tor/website/docs/en/faq.wml:566 msgid "" "All this and more about measuring Tor can be found at the <a href=\"https://" -"metrics.torproject.org\">Tor Metrics Portal</a>." +"metrics.torproject.org/\">Tor Metrics Portal</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:557 +#: /home/runa/tor/website/docs/en/faq.wml:568 msgid "<hr> <a id=\"HowUninstallTor\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:560 +#: /home/runa/tor/website/docs/en/faq.wml:571 msgid "" "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:563 +#: /home/runa/tor/website/docs/en/faq.wml:574 msgid "" "This depends entirely on how you installed it and which operating system you " "have. If you installed a package, then hopefully your package has a way to " @@ -920,35 +962,35 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:571 +#: /home/runa/tor/website/docs/en/faq.wml:582 msgid "" "In your taskbar, right click on Vidalia (the green onion or the black head) " "and choose exit." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:573 +#: /home/runa/tor/website/docs/en/faq.wml:584 msgid "" "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the " "Process List. If it's running, right click and choose End Process." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:575 +#: /home/runa/tor/website/docs/en/faq.wml:586 msgid "" "Click the Start button, go to Programs, go to Vidalia, choose Uninstall. " "This will remove the Vidalia bundle, which includes Tor and Polipo." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:577 +#: /home/runa/tor/website/docs/en/faq.wml:588 msgid "" "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton. " "Click the Uninstall button." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:582 +#: /home/runa/tor/website/docs/en/faq.wml:593 msgid "" "If you do not follow these steps (for example by trying to uninstall " "Vidalia, Tor, and Polipo while they are still running), you will need to " @@ -956,14 +998,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:588 +#: /home/runa/tor/website/docs/en/faq.wml:599 msgid "" "For Mac OS X, follow the <a href=\"<page docs/tor-doc-osx>#uninstall" "\">uninstall directions</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:593 +#: /home/runa/tor/website/docs/en/faq.wml:604 msgid "" "If you installed by source, I'm afraid there is no easy uninstall method. " "But on the bright side, by default it only installs into /usr/local/ and it " @@ -971,52 +1013,87 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:598 +#: /home/runa/tor/website/docs/en/faq.wml:609 msgid "<hr> <a id=\"PGPSigs\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:601 +#: /home/runa/tor/website/docs/en/faq.wml:612 msgid "" "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the " "download page?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:605 +#: /home/runa/tor/website/docs/en/faq.wml:615 msgid "" "These are PGP signatures, so you can verify that the file you've downloaded " "is exactly the one that we intended you to get." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:610 +#: /home/runa/tor/website/docs/en/faq.wml:620 msgid "" "Please read the <a href=\"<page docs/verifying-signatures>\">verifying " "signatures</a> page for details." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:614 +#: /home/runa/tor/website/docs/en/faq.wml:624 +msgid "<hr> <a id=\"GetTor\"></a>" +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/docs/en/faq.wml:627 +msgid "" +"<a class=\"anchor\" href=\"#GetTor\">Your website is blocked in my country. " +"How do I download Tor?</a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:631 +msgid "" +"Some government or corporate firewalls censor connections to Tor's website. " +"In those cases, you have three options. First, get it from a friend — " +"the <a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> fits " +"nicely on a USB key. Second, find the google cache for the <a href=\"<page " +"getinvolved/mirrors>\">Tor mirrors</a> page and see if any of those copies " +"of our website work for you. Third, you can download Tor via email: log in " +"to your Gmail account and mail '<tt>gettor AT torproject.org</tt>'. If you " +"include the word 'help' in the body of the email, it will reply with " +"instructions. Note that only a few webmail providers are supported, since " +"they need to be able to receive very large attachments." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:645 +msgid "" +"Be sure to <a href=\"<page docs/verifying-signatures>\">verify the " +"signature</a> of any package you download, especially when you get it from " +"somewhere other than our official HTTPS website." +msgstr "" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/faq.wml:650 msgid "<hr> <a id=\"CompileTorWindows\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:617 +#: /home/runa/tor/website/docs/en/faq.wml:653 msgid "" "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under " "Windows?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:621 +#: /home/runa/tor/website/docs/en/faq.wml:656 msgid "" "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-creation." "txt\"> tor-win32-mingw-creation.txt</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:626 +#: /home/runa/tor/website/docs/en/faq.wml:661 msgid "" "(Note that you don't need to compile Tor yourself in order to use it. Most " "people just use the packages available on the <a href=\"<page download/" @@ -1024,19 +1101,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:631 +#: /home/runa/tor/website/docs/en/faq.wml:666 msgid "<hr> <a id=\"VirusFalsePositives\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:634 +#: /home/runa/tor/website/docs/en/faq.wml:669 msgid "" "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable " "appear to have a virus or spyware?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:638 +#: /home/runa/tor/website/docs/en/faq.wml:672 msgid "" "Sometimes, overzealous Windows virus and spyware detectors trigger on some " "parts of the Tor Windows binary. Our best guess is that these are false " @@ -1047,7 +1124,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:646 +#: /home/runa/tor/website/docs/en/faq.wml:680 msgid "" "In the meantime, we encourage you to not just take our word for it. Our job " "is to provide the source; if you're concerned, please do <a href=" @@ -1055,189 +1132,212 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:651 +#: /home/runa/tor/website/docs/en/faq.wml:685 msgid "<hr> <a id=\"LiveCD\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:654 +#: /home/runa/tor/website/docs/en/faq.wml:688 msgid "" "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that " "includes Tor?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:658 +#: /home/runa/tor/website/docs/en/faq.wml:691 msgid "" -"There isn't any official LiveCD at this point. We're still trying to find " -"good solutions and trying to understand the security and anonymity " -"implications of the various options. In the mean time, feel free to check " -"out the list below and use your best judgement:" +"Yes. Use <a href=\"https://amnesia.boum.org/\">The (Amnesic) Incognito Live " +"System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser Bundle</" +"a>." msgstr "" -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:665 -msgid "LiveCDs:" +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/faq.wml:696 +msgid "<hr> <a id=\"torrc\"></a>" msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:669 +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/docs/en/faq.wml:699 msgid "" -"<a href=\"https://amnesia.boum.org/\">The (Amnesic) Incognito Live System</" -"a> is a Live System aimed at preserving your privacy and anonymity:" +"<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What " +"does that mean?</a>" msgstr "" -#. type: Content of: <div><div><ol><li><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:673 +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:702 msgid "" -"All outgoing connections to the Internet are forced to go through the Tor " -"network." +"Tor installs a text file called torrc that contains configuration " +"instructions for how your Tor program should behave. The default " +"configuration should work fine for most Tor users. Users of Vidalia can make " +"common changes through the Vidalia interface — only advanced users " +"should need to modify their torrc file directly." msgstr "" -#. type: Content of: <div><div><ol><li><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:675 -msgid "No trace is left on local storage devices unless explicitely asked." +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:710 +msgid "The location of your torrc file depends on the way you installed Tor:" msgstr "" -#. type: Content of: <div><div><ol><li><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:676 +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:714 msgid "" -"It includes Firefox, Tor, Torbutton, Vidalia graphical Tor controller, " -"Pidgin Instant Messaging client, and lots of other software." +"On Windows, if you installed a Tor bundle with Vidalia, you can find your " +"torrc file in the Start menu under Programs -> Vidalia Bundle -> Tor, " +"or you can find it by hand in <code>\\Documents and Settings\\<i>username</i>" +"\\Application Data\\Vidalia\\torrc</code>. If you installed Tor without " +"Vidalia, you can find your torrc in the Start menu under Programs -> Tor, " +"or manually in either <code>\\Documents and Settings\\Application Data\\tor" +"\\torrc</code> or <code>\\Documents and Settings\\<i>username</i>" +"\\Application Data\\tor\\torrc</code>." msgstr "" -#. type: Content of: <div><div><ol><li><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:679 +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:723 msgid "" -"It's based upon Debian gnu/linux and comes with the GNOME desktop " -"environment." +"On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, " +"open your favorite text editor and load <code>/Library/Tor/torrc</code>." msgstr "" -#. type: Content of: <div><div><ol><li><li> -#: /home/runa/tor/website/docs/en/faq.wml:682 +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:727 msgid "" -"<a href=\"http://tork.sourceforge.net/wiki/index.php/LiveCD\">TorK LiveCD</" -"a> is Knoppix-based with an emphasis on user-friendliness. You can work " -"anonymously or non-anonymously while TorK tries to keep you informed of the " -"consequences of your activity. The TorK LiveCD is experimental, so the aim " -"is to provide regular releases through 2007 and beyond." +"On Unix, if you installed a pre-built package, look for <code>/etc/tor/" +"torrc</code> or <code>/etc/torrc</code> or consult your package's " +"documentation." msgstr "" -#. type: Content of: <div><div><ol><li><li> -#: /home/runa/tor/website/docs/en/faq.wml:687 +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:731 msgid "" -"<a href=\"http://mandalka.name/privatix/\">Privatix LiveCD/USB</a> is a " -"debian based live-system including tor, firefox and torbutton which can save " -"bookmarks and other settings or data on an encrypted usb-key" +"Finally, if you installed from source, you may not have a torrc installed " +"yet: look in <code>/usr/local/etc/</code> and note that you may need to " +"manually copy <code>torrc.sample</code> to <code>torrc</code>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:694 -msgid "Windows bundles:" +#: /home/runa/tor/website/docs/en/faq.wml:738 +msgid "" +"If you use Vidalia, be sure to exit both Tor and Vidalia before you edit " +"your torrc file. Otherwise Vidalia might overwrite your changes." msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:698 +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:743 msgid "" -"<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> for Windows " -"comes with a pre-configured web browser and is self contained so you can run " -"it from a USB stick." +"Once you've changed your torrc, you will need to restart Tor for the changes " +"to take effect. (For advanced users on OS X and Unix, note that you actually " +"only need to send Tor a HUP signal, not actually restart it.)" msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:701 +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:749 msgid "" -"<a href=\"http://www.janusvm.com/tor_vm/\">Tor VM</a> is a successor to " -"JanusVM. It needs testing from you!" +"For other configuration options you can use, look at the <a href=\"<page " +"docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with # " +"in torrc are treated as comments and have no effect on Tor's configuration." msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:703 +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/faq.wml:755 +msgid "<hr> <a id=\"Logs\"></a>" +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/docs/en/faq.wml:758 msgid "" -"<a href=\"http://janusvm.com/\">JanusVM</a> is a Linux kernel and software " -"running in VMWare that sits between your Windows computer and the Internet, " -"making sure that your Internet traffic is scrubbed and anonymized." +"<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's " +"logs?</a>" msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:706 +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:761 msgid "" -"<a href=\"http://www.xerobank.com/xB_browser.html\">xB Browser</a>, " -"previously known as Torpark, is a Firefox+Tor package for Win32 that can " -"installed on a USB key. It needs a host Win32 operating system." +"If you installed a Tor bundle that includes Vidalia, then Vidalia has a " +"window called \"Message Log\" that will show you Tor's log messages. You can " +"click on \"Settings\" to see more details, or to save the messages to a " +"file. You're all set." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:712 -msgid "Not currently maintained as far as we know:" +#: /home/runa/tor/website/docs/en/faq.wml:768 +msgid "" +"If you're not using Vidalia, you'll have to go find the log files by hand. " +"Here are some likely places for your logs to be:" msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:716 +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:773 +msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/" +msgstr "" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:775 msgid "" -"Polippix / Privatlivets Fred is a Danish Knoppix-based LiveCD with Tor and " -"utilities to encrypt IP-telephony. <a href=\"http://polippix.org/\">Info and " -"download</a>." +"On Windows, there are no default log files currently. If you enable logs in " +"your torrc file, they default to <code>\\username\\Application Data\\tor\\log" +"\\</code> or <code>\\Application Data\\tor\\log\\</code>" msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:719 +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/faq.wml:779 msgid "" -"ELE is a Linux LiveCD which is focused on privacy related software. It " -"includes Tor and you can download it at <a href=\"http://www." -"northernsecurity.net/download/ele/\">http://www.northernsecurity.net/" -"download/ele/</a>." +"If you compiled Tor from source, by default your Tor logs to <a href=" +"\"http://en.wikipedia.org/wiki/Standard_streams\">\"stdout\"</a> at log-" +"level notice. If you enable logs in your torrc file, they default to <code>/" +"usr/local/var/log/tor/</code>." msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:723 +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:787 msgid "" -"Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy, " -"Tor, some IRC and IM applications, and a set of ipchains rules aimed to " -"prevent non-Tor traffic from accidentally leaving your computer. More " -"information at <a href=\"<wiki>VirtualPrivacyMachine" -"\"><wiki>VirtualPrivacyMachine</a>." +"To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a> " +"and find the section (near the top of the file) which contains the following " +"line:" msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:727 +#. type: Content of: <div><div><pre> +#: /home/runa/tor/website/docs/en/faq.wml:793 +#, no-wrap msgid "" -"Anonym.OS is a LiveCD similar to the above but is based on OpenBSD rather " -"than Linux for maximum security. It was designed to be anonymous and secure " -"from the ground up, and thus has some features and limitations not found in " -"other LiveCDs (Tor related or otherwise). You can obtain more information " -"and download Anonym.OS from <a href=\"http://theory.kaos.to/projects.html" -"\">Kaos.Theory</a>." +"\\## Logs go to stdout at level \"notice\" unless redirected by something\n" +"\\## else, like one of the below lines.\n" msgstr "" -#. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:732 +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:798 msgid "" -"Phantomix is a LiveCD for anonymous surfing and chatting based on the most " -"recent KNOPPIX release. It comes preconfigured with Privoxy, Tor and Polipo. " -"You can get it from the <a href=\"http://phantomix.ytternhagen.de/" -"\">Phantomix Website</a>." +"For example, if you want Tor to send complete debug, info, notice, warn, and " +"err level messages to a file, append the following line to the end of the " +"section:" msgstr "" +#. type: Content of: <div><div><pre> +#: /home/runa/tor/website/docs/en/faq.wml:804 +#, no-wrap +msgid "Log debug file c:/program files/tor/debug.log\n" +msgstr "" + #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:739 -msgid "Please contact us if you know any others." +#: /home/runa/tor/website/docs/en/faq.wml:808 +msgid "" +"Replace <code>c:/program files/tor/debug.log</code> with a directory and " +"filename for your Tor log." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:742 +#: /home/runa/tor/website/docs/en/faq.wml:812 msgid "<hr> <a id=\"DoesntWork\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:745 +#: /home/runa/tor/website/docs/en/faq.wml:815 msgid "" "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's " "not working.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:749 +#: /home/runa/tor/website/docs/en/faq.wml:818 msgid "" "Once you've installed the Tor bundle, there are two questions to ask: first, " "is your Tor able to establish a circuit? Second, is your Firefox correctly " @@ -1245,30 +1345,29 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:754 +#: /home/runa/tor/website/docs/en/faq.wml:823 msgid "" "If Tor can establish a circuit, the onion icon in Vidalia will turn green. " "You can also check in the Vidalia Control Panel to make sure it says " "\"Connected to the Tor network!\" under Status. For those not using Vidalia, " -"check your <a href=\"<wikifaq>#HowdoIsetuploggingorseeTorslogs\">Tor logs</" -"a> for a line saying that Tor \"has successfully opened a circuit. Looks " -"like client functionality is working.\"" +"check your <a href=\"#Logs\">Tor logs</a> for a line saying that Tor \"has " +"successfully opened a circuit. Looks like client functionality is working.\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:764 +#: /home/runa/tor/website/docs/en/faq.wml:833 msgid "If Tor can't establish a circuit, here are some hints:" msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:768 +#: /home/runa/tor/website/docs/en/faq.wml:837 msgid "" "Are you sure Tor is running? If you're using Vidalia, you may have to click " "on the onion and select \"Start\" to launch Tor." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:770 +#: /home/runa/tor/website/docs/en/faq.wml:839 msgid "" "Check your system clock. If it's more than a few hours off, Tor will refuse " "to build circuits. For XP users, synchronize your clock under the clock -" @@ -1277,16 +1376,15 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:774 +#: /home/runa/tor/website/docs/en/faq.wml:843 msgid "" -"Is your Internet connection <a href=" -"\"<wikifaq>#Myfirewallonlyallowsafewoutgoingports.\">firewalled</a>, or do " -"you normally need to use a <a href=" +"Is your Internet connection <a href=\"#FirewallPorts\">firewalled by port</" +"a>, or do you normally need to use a <a href=" "\"<wikifaq>#MyInternetconnectionrequiresanHTTPorSOCKSproxy.\">proxy</a>?" msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:779 +#: /home/runa/tor/website/docs/en/faq.wml:848 msgid "" "Are you running programs like Norton Internet Security or SELinux that block " "certain connections, even though you don't realize they do? They could be " @@ -1294,7 +1392,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:782 +#: /home/runa/tor/website/docs/en/faq.wml:851 msgid "" "Are you in China, or behind a restrictive corporate network firewall that " "blocks the public Tor relays? If so, you should learn about <a href=\"<page " @@ -1302,14 +1400,14 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:785 +#: /home/runa/tor/website/docs/en/faq.wml:854 msgid "" -"Check your <a href=\"<wikifaq>#HowdoIsetuploggingorseeTorslogs\">Tor logs</" -"a>. Do they give you any hints about what's going wrong?" +"Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about " +"what's going wrong?" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:790 +#: /home/runa/tor/website/docs/en/faq.wml:859 msgid "" "Step two is to confirm that Firefox is correctly configured to send its " "traffic through Tor. Try the <a href=\"https://check.torproject.org/\">Tor " @@ -1319,12 +1417,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:798 +#: /home/runa/tor/website/docs/en/faq.wml:867 msgid "If it thinks you're not using Tor, here are some hints:" msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:802 +#: /home/runa/tor/website/docs/en/faq.wml:871 msgid "" "Did you install the Torbutton extension for Firefox? The installation " "bundles include it, but sometimes people forget to install it. Make sure it " @@ -1333,7 +1431,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:807 +#: /home/runa/tor/website/docs/en/faq.wml:876 msgid "" "Do you have incompatible Firefox extensions like FoxyProxy installed? If so, " "uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute " @@ -1344,7 +1442,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:814 +#: /home/runa/tor/website/docs/en/faq.wml:883 msgid "" "If your browser says \"The proxy server is refusing connections.\", check " "that Polipo (the http proxy that passes traffic between Firefox and Tor) is " @@ -1354,7 +1452,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:819 +#: /home/runa/tor/website/docs/en/faq.wml:888 msgid "" "If you're upgrading from OS X, some of the earlier OS X installers were " "broken in really unfortunate ways. You may find that <a href=\"<page docs/" @@ -1364,14 +1462,14 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:824 +#: /home/runa/tor/website/docs/en/faq.wml:893 msgid "" "If you're on Linux, make sure Privoxy isn't running, since it will conflict " "with the port that our Polipo configuration file picks." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:826 +#: /home/runa/tor/website/docs/en/faq.wml:895 msgid "" "If you installed Polipo yourself (not from a bundle), did you edit the " "config file as described? Did you restart Polipo after this change? Are you " @@ -1379,7 +1477,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:829 +#: /home/runa/tor/website/docs/en/faq.wml:898 msgid "" "For Red Hat Linux and related systems, do you have SELinux enabled? If so, " "it might be preventing Polipo from talking to Tor. We also run across BSD " @@ -1388,19 +1486,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:835 +#: /home/runa/tor/website/docs/en/faq.wml:904 msgid "<hr /> <a id=\"VidaliaPassword\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:838 +#: /home/runa/tor/website/docs/en/faq.wml:907 msgid "" "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a " "password at start.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:842 +#: /home/runa/tor/website/docs/en/faq.wml:910 msgid "" "Vidalia interacts with the Tor software via Tor's \"control port\". The " "control port lets Vidalia receive status updates from Tor, request a new " @@ -1411,7 +1509,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:851 +#: /home/runa/tor/website/docs/en/faq.wml:919 msgid "" "Usually this process of generating and setting a random control password " "happens in the background. There are three common situations, though, where " @@ -1419,7 +1517,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:857 +#: /home/runa/tor/website/docs/en/faq.wml:925 msgid "" "You're already running Vidalia and Tor. For example, this situation can " "happen if you installed the Vidalia bundle and now you're trying to run the " @@ -1428,7 +1526,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:862 +#: /home/runa/tor/website/docs/en/faq.wml:930 msgid "" "Vidalia crashed, but left Tor running with the last known random password. " "After you restart Vidalia, it generates a new random password, but Vidalia " @@ -1442,7 +1540,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:875 +#: /home/runa/tor/website/docs/en/faq.wml:943 msgid "" "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 " @@ -1457,73 +1555,74 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:890 +#: /home/runa/tor/website/docs/en/faq.wml:958 msgid "<hr> <a id=\"ChooseEntryExit\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:893 +#: /home/runa/tor/website/docs/en/faq.wml:961 msgid "" "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or " "country) are used for entry/exit?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:896 +#: /home/runa/tor/website/docs/en/faq.wml:964 msgid "" "Yes. You can set preferred entry and exit nodes as well as inform Tor which " "nodes you do not want to use. The following options can be added to your " -"config file \"torrc\" or specified on the command line:" +"config file <a href=\"#torrc\">\"torrc\"</a> or specified on the command " +"line:" msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:902 +#: /home/runa/tor/website/docs/en/faq.wml:970 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:903 +#: /home/runa/tor/website/docs/en/faq.wml:971 msgid "" "A list of preferred nodes to use for the first hop in the circuit, if " "possible." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:905 +#: /home/runa/tor/website/docs/en/faq.wml:973 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:906 +#: /home/runa/tor/website/docs/en/faq.wml:974 msgid "" "A list of preferred nodes to use for the last hop in the circuit, if " "possible." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:908 +#: /home/runa/tor/website/docs/en/faq.wml:976 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:909 +#: /home/runa/tor/website/docs/en/faq.wml:977 msgid "A list of nodes to never use when building a circuit." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/docs/en/faq.wml:911 +#: /home/runa/tor/website/docs/en/faq.wml:979 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/docs/en/faq.wml:912 +#: /home/runa/tor/website/docs/en/faq.wml:980 msgid "" "A list of nodes to never use when picking an exit. Nodes listed in " "<tt>ExcludeNodes</tt> are automatically in this list." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:917 +#: /home/runa/tor/website/docs/en/faq.wml:985 msgid "" "<em>We recommend you do not use these</em> — they are intended for " "testing and may disappear in future versions. You get the best security " @@ -1533,11 +1632,11 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:923 +#: /home/runa/tor/website/docs/en/faq.wml:992 msgid "" "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</" +"them. You can make the option mandatory by setting <tt>StrictExitNodes 1</" "tt> or <tt>StrictEntryNodes 1</tt> — 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 docs/documentation>#NeatLinks\">Tor " @@ -1545,16 +1644,16 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:933 +#: /home/runa/tor/website/docs/en/faq.wml:1002 msgid "" "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 " "country code in curly braces (for example {de}), or an ip address pattern " -"(for example 255.254.0.0/8), or a node nickname. Make sure there are no " +"(for example 255.254.0.0/8), or a node nickname. Make sure there are no " "spaces between the commas and the list items." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:941 +#: /home/runa/tor/website/docs/en/faq.wml:1008 msgid "" "If you want to access a service directly through Tor's SOCKS interface (eg. " "using ssh via connect.c), another option is to set up an internal mapping in " @@ -1563,26 +1662,26 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:947 +#: /home/runa/tor/website/docs/en/faq.wml:1014 msgid "<hr> <a id=\"GoogleCaptcha\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:950 +#: /home/runa/tor/website/docs/en/faq.wml:1017 msgid "" "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha " "or tells me I have spyware installed.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:954 +#: /home/runa/tor/website/docs/en/faq.wml:1020 msgid "" "This is a known and intermittent problem; it does not mean that Google " "considers Tor to be spyware." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:959 +#: /home/runa/tor/website/docs/en/faq.wml:1025 msgid "" "When you use Tor, you are sending queries through exit relays that are also " "shared by thousands of other users. Tor users typically see this message " @@ -1593,7 +1692,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:967 +#: /home/runa/tor/website/docs/en/faq.wml:1033 msgid "" "An alternate explanation is that Google tries to detect certain kinds of " "spyware or viruses that send distinctive queries to Google Search. It notes " @@ -1603,7 +1702,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:976 +#: /home/runa/tor/website/docs/en/faq.wml:1042 msgid "" "To our knowledge, Google is not doing anything intentionally specifically to " "deter or block Tor use. The error message about an infected machine should " @@ -1611,7 +1710,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:982 +#: /home/runa/tor/website/docs/en/faq.wml:1048 msgid "" "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can " "automatically redirect you to a more Tor-friendly search engine such as " @@ -1619,53 +1718,58 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:987 +#: /home/runa/tor/website/docs/en/faq.wml:1053 msgid "<hr /> <a id=\"GmailWarning\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:990 +#: /home/runa/tor/website/docs/en/faq.wml:1056 msgid "" "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account " "may have been compromised.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:994 +#: /home/runa/tor/website/docs/en/faq.wml:1059 msgid "" "Sometimes, after you've used Gmail over Tor, Google presents a pop-up " -"notification that your account may have been compromised. The notification " +"notification that your account may have been compromised. The notification " "window lists a series of IP addresses and locations throughout the world " "recently used to access your account." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1001 +#: /home/runa/tor/website/docs/en/faq.wml:1066 msgid "" "In general this is a false alarm: Google saw a bunch of logins from " -"different places and wanted to let you know. If you use Tor to access a " -"Google service, then it will appear like you're coming from lots of " -"different places. Nothing to worry about in particular." +"different places, as a result of running the service via Tor, and decided it " +"was a good idea to confirm the account was being accessed by it's rightful " +"owner." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1009 +#: /home/runa/tor/website/docs/en/faq.wml:1073 msgid "" -"But that doesn't mean you can entirely ignore the warning. It's <i>probably</" -"i> a false positive, but it might not be. It is possible that somebody could " -"at some point steal your Google cookie, which would allow them to log in to " -"the Google service as you. They might steal it by breaking into your " -"computer, or by watching your network traffic at Starbucks or sniffing your " -"wireless at home (when you're not using Tor), or by watching traffic going " -"over the Tor network. In theory none of this should be possible because " -"Gmail and similar services should only send the cookie over an SSL link. In " -"practice, alas, it's <a href=\"http://fscked.org/blog/fully-automated-active-" -"https-cookie-hijacking\">way more complex than that</a>." +"Even though this may be a biproduct of using the service via tor, that " +"doesn't mean you can entirely ignore the warning. It is <i>probably</i> a " +"false positive, but it might not be since it is possible for someone to " +"hijack your Google cookie." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1023 +#: /home/runa/tor/website/docs/en/faq.wml:1080 msgid "" +"Cookie hijacking is possible by either physical access to your computer or " +"by watching your network traffic. In theory only physical access should " +"compromise your system because Gmail and similar services should only send " +"the cookie over an SSL link. In practice, alas, it's <a href=\"http://fscked." +"org/blog/fully-automated-active-https-cookie-hijacking\"> way more complex " +"than that</a>." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1089 +msgid "" "And if somebody <i>did</i> steal your google cookie, they might end up " "logging in from unusual places (though of course they also might not). So " "the summary is that since you're using Tor, this security measure that " @@ -1676,33 +1780,80 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1032 -msgid "<hr /> <a id=\"RelayFlexible\"></a>" +#: /home/runa/tor/website/docs/en/faq.wml:1098 +msgid "<hr> <a id=\"FirewallPorts\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1035 +#: /home/runa/tor/website/docs/en/faq.wml:1101 msgid "" +"<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few " +"outgoing ports.</a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1104 +msgid "" +"If your firewall works by blocking ports, then you can tell Tor to only use " +"the ports that your firewall permits by adding \"FascistFirewall 1\" to your " +"<a href=\"<page docs/faq>#torrc\">torrc configuration file</a>, or by " +"clicking \"My firewall only lets me connect to certain ports\" in Vidalia's " +"Network Settings window." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1112 +msgid "" +"By default, when you set this Tor assumes that your firewall allows only " +"port 80 and port 443 (HTTP and HTTPS respectively). You can select a " +"different set of ports with the FirewallPorts torrc option." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1118 +msgid "" +"If you want to be more fine-grained with your controls, you can also use the " +"ReachableAddresses config options, e.g.:" +msgstr "" + +#. type: Content of: <div><div><pre> +#: /home/runa/tor/website/docs/en/faq.wml:1123 +#, no-wrap +msgid "" +" ReachableDirAddresses *:80\n" +" ReachableORAddresses *:443\n" +msgstr "" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/faq.wml:1127 +msgid "<hr> <a id=\"RelayFlexible\"></a>" +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/docs/en/faq.wml:1130 +msgid "" "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to " "be?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1039 +#: /home/runa/tor/website/docs/en/faq.wml:1133 msgid "We aim to make setting up a Tor relay easy and convenient:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1043 +#: /home/runa/tor/website/docs/en/faq.wml:1137 msgid "" -"Tor has built-in support for <a href=\"<wikifaq>#LimitBandwidth\"> rate " +"Tor has built-in support for <a href=" +"\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> 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=" -"\"<wikifaq>#Hibernation\">hibernation feature</a>." +"\"<wikifaq>#HowcanIlimitthetotalamountofbandwidthusedbymyTorrelay" +"\">hibernation feature</a>." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1051 +#: /home/runa/tor/website/docs/en/faq.wml:1145 msgid "" "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that " "specifies what sort of outbound connections are allowed or refused from that " @@ -1711,7 +1862,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1056 +#: /home/runa/tor/website/docs/en/faq.wml:1150 msgid "" "It's fine if the relay goes offline sometimes. The directories notice this " "quickly and stop advertising the relay. Just try to make sure it's not too " @@ -1719,24 +1870,23 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1061 +#: /home/runa/tor/website/docs/en/faq.wml:1155 msgid "" "We can handle relays with dynamic IPs just fine — simply leave the " "Address config option blank, and Tor will try to guess." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1064 +#: /home/runa/tor/website/docs/en/faq.wml:1158 msgid "" "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=" -"\"<wikifaq>#ServerForFirewalledClients\">this FAQ entry</a> offers some " -"examples on how to do this." +"connections is system dependent but <a href=\"<wikifaq>#ImbehindaNATFirewall" +"\">this FAQ entry</a> offers some examples on how to do this." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1070 +#: /home/runa/tor/website/docs/en/faq.wml:1164 msgid "" "Your relay will passively estimate and advertise its recent bandwidth " "capacity, so high-bandwidth relays will attract more users than low-" @@ -1744,24 +1894,24 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1076 +#: /home/runa/tor/website/docs/en/faq.wml:1170 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1080 +#: /home/runa/tor/website/docs/en/faq.wml:1174 msgid "" "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want " "to deal with abuse issues.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1084 +#: /home/runa/tor/website/docs/en/faq.wml:1177 msgid "Great. That's exactly why we implemented exit policies." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1088 +#: /home/runa/tor/website/docs/en/faq.wml:1181 msgid "" "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 " @@ -1777,22 +1927,22 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1102 +#: /home/runa/tor/website/docs/en/faq.wml:1195 msgid "" "The default exit policy allows access to many popular services (e.g. web " -"browsing), but <a href=\"<wikifaq>#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=" -"\"<wikifaq>#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=\"<wikifaq>#Istherealistofdefaultexitports" +"\">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=\"<page docs/faq>#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." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1116 +#: /home/runa/tor/website/docs/en/faq.wml:1209 msgid "" "If you do allow any exit connections, make sure name resolution works (that " "is, your computer can resolve Internet addresses correctly). If there are " @@ -1802,19 +1952,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1124 +#: /home/runa/tor/website/docs/en/faq.wml:1217 msgid "<hr> <a id=\"RelayOrBridge\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1127 +#: /home/runa/tor/website/docs/en/faq.wml:1220 msgid "" "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or " "bridge relay?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1130 +#: /home/runa/tor/website/docs/en/faq.wml:1222 msgid "" "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for " "short) are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't " @@ -1824,7 +1974,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1137 +#: /home/runa/tor/website/docs/en/faq.wml:1229 msgid "" "Being a normal relay vs being a bridge relay is almost the same " "configuration: it's just a matter of whether your relay is listed publically " @@ -1832,7 +1982,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1142 +#: /home/runa/tor/website/docs/en/faq.wml:1234 msgid "" "Right now, there are a small number of places in the world that filter " "connections to the Tor network. So getting a lot of bridges running right " @@ -1843,7 +1993,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1150 +#: /home/runa/tor/website/docs/en/faq.wml:1242 msgid "" "So should you run a normal relay or bridge relay? If you have lots of " "bandwidth, you should definitely run a normal relay — bridge relays " @@ -1854,26 +2004,79 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1158 +#: /home/runa/tor/website/docs/en/faq.wml:1250 +msgid "<hr> <a id=\"MultipleRelays\"></a>" +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/docs/en/faq.wml:1253 +msgid "" +"<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one " +"relay.</a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1256 +msgid "" +"Great. If you want to run several relays to donate more to the network, " +"we're happy with that. But please don't run more than a few dozen on the " +"same network, since part of the goal of the Tor network is dispersal and " +"diversity." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1263 +msgid "" +"If you do decide to run more than one relay, please set the \"MyFamily\" " +"config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all " +"the relays (comma-separated) that are under your control:" +msgstr "" + +#. type: Content of: <div><div><pre> +#: /home/runa/tor/website/docs/en/faq.wml:1269 +#, no-wrap +msgid " MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1273 +msgid "" +"where each fingerprint is the 40 character identity fingerprint (without " +"spaces). You can also list them by nickname, but fingerprint is safer. Be " +"sure to prefix the digest strings with a dollar sign ('$') so that the " +"digest is not confused with a nickname in the config file." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1280 +msgid "" +"That way clients will know to avoid using more than one of your relays in a " +"single circuit. You should set MyFamily if you have administrative control " +"of the computers or of their network, even if they're not all in the same " +"geographic location." +msgstr "" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/faq.wml:1286 msgid "<hr> <a id=\"RelayMemory\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1161 +#: /home/runa/tor/website/docs/en/faq.wml:1289 msgid "" "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much " "memory?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1164 +#: /home/runa/tor/website/docs/en/faq.wml:1291 msgid "" "If your Tor relay is using more memory than you'd like, here are some tips " "for reducing its footprint:" msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1169 +#: /home/runa/tor/website/docs/en/faq.wml:1296 msgid "" "If you're on Linux, you may be encountering memory fragmentation bugs in " "glibc's malloc implementation. That is, when Tor releases memory back to the " @@ -1885,7 +2088,7 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1177 +#: /home/runa/tor/website/docs/en/faq.wml:1304 msgid "" "If you're running a fast relay, meaning you have many TLS connections open, " "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+ " @@ -1896,15 +2099,16 @@ msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1185 +#: /home/runa/tor/website/docs/en/faq.wml:1312 msgid "" "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=\"<wikifaq>#RelayOS\">better operating system</a>." +"switching to a <a href=\"<wikifaq>#WhydoesntmyWindowsorotherOSTorrelayrunwell" +"\">better operating system</a>." msgstr "" #. type: Content of: <div><div><ol><li> -#: /home/runa/tor/website/docs/en/faq.wml:1191 +#: /home/runa/tor/website/docs/en/faq.wml:1318 msgid "" "If you still can't handle the memory load, consider reducing the amount of " "bandwidth your relay advertises. Advertising less bandwidth means you will " @@ -1913,61 +2117,61 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1200 +#: /home/runa/tor/website/docs/en/faq.wml:1327 msgid "" "All of this said, fast Tor relays do use a lot of ram. It is not unusual for " "a fast exit relay to use 500-1000 MB of memory." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1204 +#: /home/runa/tor/website/docs/en/faq.wml:1331 msgid "<hr> <a id=\"WhyNotNamed\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1207 +#: /home/runa/tor/website/docs/en/faq.wml:1334 msgid "" "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1210 +#: /home/runa/tor/website/docs/en/faq.wml:1337 msgid "" "We currently use these metrics to determine if your relay should be named:" "<br>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1213 +#: /home/runa/tor/website/docs/en/faq.wml:1340 msgid "" "The name is not currently mapped to a different key. Existing mappings are " "removed after 6 months of inactivity from a relay." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1215 +#: /home/runa/tor/website/docs/en/faq.wml:1342 msgid "The relay must have been around for at least two weeks." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/docs/en/faq.wml:1216 +#: /home/runa/tor/website/docs/en/faq.wml:1343 msgid "No other router may have wanted the same name in the past month." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1219 +#: /home/runa/tor/website/docs/en/faq.wml:1346 msgid "<hr> <a id=\"KeyManagement\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1222 +#: /home/runa/tor/website/docs/en/faq.wml:1349 msgid "" "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor " "uses.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1226 +#: /home/runa/tor/website/docs/en/faq.wml:1352 msgid "" "Tor uses a variety of different keys, with three goals in mind: 1) " "encryption to ensure privacy of data within the Tor network, 2) " @@ -1977,7 +2181,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1234 +#: /home/runa/tor/website/docs/en/faq.wml:1360 msgid "" "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so " "observers can't look inside to see which circuit a given cell is intended " @@ -1988,7 +2192,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1244 +#: /home/runa/tor/website/docs/en/faq.wml:1370 msgid "" "<b>Authentication</b>: Every Tor relay has a public decryption key called " "the \"onion key\". When the Tor client establishes circuits, at each step " @@ -1999,22 +2203,22 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1254 +#: /home/runa/tor/website/docs/en/faq.wml:1380 msgid "" "<b>Coordination</b>: How do clients know what the relays are, and how do " "they know that they have the right keys for them? Each relay has a long-term " "public signing key called the \"identity key\". Each directory authority " "additionally has a \"directory signing key\". The directory authorities <a " -"href=\"<gitblob>doc/spec/dir-spec.txt\">provide a signed list</a> of all the " -"known relays, and in that list are a set of certificates from each relay " -"(self-signed by their identity key) specifying their keys, locations, exit " +"href=\"<specblob>dir-spec.txt\">provide a signed list</a> of all the known " +"relays, and in that list are a set of certificates from each relay (self-" +"signed by their identity key) specifying their keys, locations, exit " "policies, and so on. So unless the adversary can control a threshold of the " "directory authorities, he can't trick the Tor client into using other Tor " "relays." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1268 +#: /home/runa/tor/website/docs/en/faq.wml:1394 msgid "" "How do clients know what the directory authorities are? The Tor software " "comes with a built-in list of location and public key for each directory " @@ -2023,7 +2227,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1275 +#: /home/runa/tor/website/docs/en/faq.wml:1401 msgid "" "How do users know they've got the right software? When we distribute the " "source code or a package, we digitally sign it with <a href=\"http://www." @@ -2032,7 +2236,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1283 +#: /home/runa/tor/website/docs/en/faq.wml:1409 msgid "" "In order to be certain that it's really signed by us, you need to have met " "us in person and gotten a copy of our GPG key fingerprint, or you need to " @@ -2042,33 +2246,106 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1290 +#: /home/runa/tor/website/docs/en/faq.wml:1416 +msgid "" +"<hr> [https://www.torproject.org/docs/faq#EntryGuards Answer moved to our " +"new FAQ page] <a id=\"EntryGuards\"></a>" +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/docs/en/faq.wml:1421 +msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1424 +msgid "" +"Tor (like all current practical low-latency anonymity designs) fails when " +"the attacker can see both ends of the communications channel. For example, " +"suppose the attacker controls or watches the Tor relay you choose to enter " +"the network, and also controls or watches the website you visit. In this " +"case, the research community knows no practical low-latency design that can " +"reliably stop the attacker from correlating volume and timing information on " +"the two sides." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1434 +msgid "" +"So, what should we do? Suppose the attacker controls, or can observe, <i>C</" +"i> relays. Suppose there are <i>N</i> relays total. If you select new entry " +"and exit relays each time you use the network, the attacker will be able to " +"correlate all traffic you send with probability <i>(c/n)<sup>2</sup></i>. " +"But profiling is, for most users, as bad as being traced all the time: they " +"want to do something often without an attacker noticing, and the attacker " +"noticing once is as bad as the attacker noticing more often. Thus, choosing " +"many random entries and exits gives the user no chance of escaping profiling " +"by this kind of attacker." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1446 +msgid "" +"The solution is \"entry guards\": each user selects a few relays at random " +"to use as entry points, and uses only those relays for her first hop. If " +"those relays are not controlled or observed, the attacker can't win, ever, " +"and the user is secure. If those relays <i>are</i> observed or controlled by " +"the attacker, the attacker sees a larger <i>fraction</i> of the user's " +"traffic — but still the user is no more profiled than before. Thus, " +"the user has some chance (on the order of <i>(n-c)/n</i>) of avoiding " +"profiling, whereas she had none before." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1457 +msgid "" +"You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\">An " +"Analysis of the Degradation of Anonymous Protocols</a>, <a href=\"http://" +"freehaven.net/anonbib/#wright03\">Defending Anonymous Communication Against " +"Passive Logging Attacks</a>, and especially <a href=\"http://freehaven.net/" +"anonbib/#hs-attack06\">Locating Hidden Servers</a>." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1466 +msgid "" +"Restricting your entry nodes may also help against attackers who want to run " +"a few Tor nodes and easily enumerate all of the Tor user IP addresses. (Even " +"though they can't learn what destinations the users are talking to, they " +"still might be able to do bad things with just a list of users.) However, " +"that feature won't really become useful until we move to a \"directory guard" +"\" design as well." +msgstr "" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/faq.wml:1474 msgid "<hr> <a id=\"EverybodyARelay\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1293 +#: /home/runa/tor/website/docs/en/faq.wml:1477 msgid "" "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user " "be a relay.</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1297 +#: /home/runa/tor/website/docs/en/faq.wml:1480 msgid "" "Requiring every Tor user to be a relay would help with scaling the network " -"to handle all our users, and <a href=\"<wikifaq>#RelayAnonymity\">running a " -"Tor relay may help your anonymity</a>. However, many Tor users cannot be " -"good relays — 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." +"to handle all our users, and <a href=" +"\"<wikifaq>#DoIgetbetteranonymityifIrunarelay\">running a Tor relay may help " +"your anonymity</a>. However, many Tor users cannot be good relays — " +"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." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1309 +#: /home/runa/tor/website/docs/en/faq.wml:1493 msgid "" "That said, we do want to encourage Tor users to run relays, so what we " "really want to do is simplify the process of setting up and maintaining a " @@ -2079,12 +2356,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1318 +#: /home/runa/tor/website/docs/en/faq.wml:1502 msgid "There are five steps we need to address before we can do this though:" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1322 +#: /home/runa/tor/website/docs/en/faq.wml:1506 msgid "" "First, we need to make Tor stable as a relay on all common operating " "systems. The main remaining platform is Windows, and we plan to finally " @@ -2093,19 +2370,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1330 +#: /home/runa/tor/website/docs/en/faq.wml:1514 msgid "" "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 getinvolved/" "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=\"<wikifaq>#TransportIPnotTCP\">switching " -"to UDP transport</a> is the simplest answer here — which alas is not a " -"very simple answer at all." +"DSL)\". It might be that <a href=\"<page docs/faq>#TransportIPnotTCP" +"\">switching to UDP transport</a> is the simplest answer here — which " +"alas is not a very simple answer at all." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1341 +#: /home/runa/tor/website/docs/en/faq.wml:1525 msgid "" "Third, we need to work on scalability, both of the network (how to stop " "requiring that all Tor relays be able to connect to all Tor relays) and of " @@ -2117,7 +2394,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1351 +#: /home/runa/tor/website/docs/en/faq.wml:1535 msgid "" "Fourth, we need to better understand the risks from letting the attacker " "send traffic through your relay while you're also initiating your own " @@ -2134,7 +2411,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1367 +#: /home/runa/tor/website/docs/en/faq.wml:1551 msgid "" "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=" @@ -2142,43 +2419,137 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1374 +#: /home/runa/tor/website/docs/en/faq.wml:1558 msgid "Please help on all of these!" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1377 +#: /home/runa/tor/website/docs/en/faq.wml:1561 +msgid "<hr> <a id=\"TransportIPnotTCP\"></a>" +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/docs/en/faq.wml:1564 +msgid "" +"<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP " +"packets, not just TCP packets.</a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1567 +msgid "" +"This would be handy, because it would make Tor better able to handle new " +"protocols like VoIP, it could solve the whole need to socksify applications, " +"and it would solve the fact that exit relays need to allocate a lot of file " +"descriptors to hold open all the exit connections." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/faq.wml:1574 +msgid "" +"We're heading in this direction: see <a href=\"https://trac.torproject.org/" +"projects/tor/ticket/1855\">this trac ticket</a> for directions we should " +"investigate. Some of the hard problems are:" +msgstr "" + +#. type: Content of: <div><div><ol><li> +#: /home/runa/tor/website/docs/en/faq.wml:1581 +msgid "" +"IP packets reveal OS characteristics. We would still need to do IP-level " +"packet normalization, to stop things like TCP fingerprinting attacks. Given " +"the diversity and complexity of TCP stacks, along with <a href=" +"\"<wikifaq>#DoesTorresistremotephysicaldevicefingerprinting\">device " +"fingerprinting attacks</a>, it looks like our best bet is shipping our own " +"user-space TCP stack." +msgstr "" + +#. type: Content of: <div><div><ol><li> +#: /home/runa/tor/website/docs/en/faq.wml:1588 +msgid "" +"Application-level streams still need scrubbing. We will still need user-side " +"applications like Torbutton. So it won't become just a matter of capturing " +"packets and anonymizing them at the IP layer." +msgstr "" + +#. type: Content of: <div><div><ol><li> +#: /home/runa/tor/website/docs/en/faq.wml:1592 +msgid "" +"Certain protocols will still leak information. For example, we must rewrite " +"DNS requests so they are delivered to an unlinkable DNS server rather than " +"the DNS server at a user's ISP; thus, we must understand the protocols we " +"are transporting." +msgstr "" + +#. type: Content of: <div><div><ol><li> +#: /home/runa/tor/website/docs/en/faq.wml:1597 +msgid "" +"<a href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html" +"\">DTLS</a> (datagram TLS) basically has no users, and IPsec sure is big. " +"Once we've picked a transport mechanism, we need to design a new end-to-end " +"Tor protocol for avoiding tagging attacks and other potential anonymity and " +"integrity issues now that we allow drops, resends, et cetera." +msgstr "" + +#. type: Content of: <div><div><ol><li> +#: /home/runa/tor/website/docs/en/faq.wml:1604 +msgid "" +"Exit policies for arbitrary IP packets mean building a secure IDS. Our node " +"operators tell us that exit policies are one of the main reasons they're " +"willing to run Tor. Adding an Intrusion Detection System to handle exit " +"policies would increase the security complexity of Tor, and would likely not " +"work anyway, as evidenced by the entire field of IDS and counter-IDS papers. " +"Many potential abuse issues are resolved by the fact that Tor only " +"transports valid TCP streams (as opposed to arbitrary IP including malformed " +"packets and IP floods), so exit policies become even <i>more</i> important " +"as we become able to transport IP packets. We also need to compactly " +"describe exit policies in the Tor directory, so clients can predict which " +"nodes will allow their packets to exit — and clients need to predict " +"all the packets they will want to send in a session before picking their " +"exit node!" +msgstr "" + +#. type: Content of: <div><div><ol><li> +#: /home/runa/tor/website/docs/en/faq.wml:1618 +msgid "" +"The Tor-internal name spaces would need to be redesigned. We support hidden " +"service \".onion\" addresses by intercepting the addresses when they are " +"passed to the Tor client. Doing so at the IP level will require a more " +"complex interface between Tor and the local DNS resolver." +msgstr "" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/faq.wml:1625 msgid "<hr> <a id=\"Criminals\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1380 +#: /home/runa/tor/website/docs/en/faq.wml:1628 msgid "" "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do " "bad things?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1384 +#: /home/runa/tor/website/docs/en/faq.wml:1631 msgid "" "For the answer to this question and others, please see our <a href=\"<page " "docs/faq-abuse>\">Tor Abuse FAQ</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:1388 +#: /home/runa/tor/website/docs/en/faq.wml:1635 msgid "<hr> <a id=\"RespondISP\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/tor/website/docs/en/faq.wml:1391 +#: /home/runa/tor/website/docs/en/faq.wml:1638 msgid "" "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my " "exit relay?</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/faq.wml:1395 +#: /home/runa/tor/website/docs/en/faq.wml:1641 msgid "" "A collection of templates for successfully responding to ISPs is <a href=" "\"<wiki>TheOnionRouter/TorAbuseTemplates\">collected here</a>." Modified: translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/docs/2-medium.verifying-signatures.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-12 12:20+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -30,8 +30,8 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:13 -#: /tmp/cQhhW5Yv14.xml:38 /tmp/cQhhW5Yv14.xml:54 /tmp/cQhhW5Yv14.xml:81 -#: /tmp/cQhhW5Yv14.xml:155 +#: /tmp/ETpEqGX4UH.xml:38 /tmp/ETpEqGX4UH.xml:54 /tmp/ETpEqGX4UH.xml:81 +#: /tmp/ETpEqGX4UH.xml:155 msgid "<hr>" msgstr "" @@ -144,12 +144,12 @@ msgid "" "The next step is to import the key. This can be done directly from GnuPG. " "Make sure you import the correct key. For example, if you downloaded a " -"Windows package, you will need to import Andrew's key." +"Windows package, you will need to import Erinn's key." msgstr "" #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:59 -#: /tmp/cQhhW5Yv14.xml:84 /tmp/cQhhW5Yv14.xml:163 +#: /tmp/ETpEqGX4UH.xml:84 /tmp/ETpEqGX4UH.xml:163 msgid "<b>Windows:</b>" msgstr "" @@ -176,7 +176,7 @@ #. type: Content of: <div><div><p> #: /home/runa/tor/website/docs/en/verifying-signatures.wml:70 -#: /tmp/cQhhW5Yv14.xml:87 +#: /tmp/ETpEqGX4UH.xml:87 msgid "<b>Mac and Linux</b>" msgstr "" Modified: translation/trunk/projects/website/po/templates/docs/3-low.debian.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/3-low.debian.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/docs/3-low.debian.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-12 12:20+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -37,8 +37,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/X5hNtpS8Ny.xml:43 -#: /tmp/X5hNtpS8Ny.xml:112 /tmp/X5hNtpS8Ny.xml:147 +#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/__TMvx4TV6.xml:43 +#: /tmp/__TMvx4TV6.xml:113 /tmp/__TMvx4TV6.xml:148 msgid "<br />" msgstr "" @@ -58,8 +58,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/X5hNtpS8Ny.xml:93 -#: /tmp/X5hNtpS8Ny.xml:138 /tmp/X5hNtpS8Ny.xml:181 +#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/__TMvx4TV6.xml:94 +#: /tmp/__TMvx4TV6.xml:139 /tmp/__TMvx4TV6.xml:182 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions." @@ -88,77 +88,77 @@ msgid "" "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. A quick command " -"to run is <tt>lsb_release -c</tt>. Here's a quick mapping:" +"to run is <tt>lsb_release -c</tt> or <tt>cat /etc/debian_version</tt>. " +"Here's a quick mapping:" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:56 -msgid "Ubuntu 10.10 is \"maverick\"" -msgstr "" - -#. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:57 -msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" +msgid "Debian unstable (sid) is \"sid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:58 -msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" +msgid "Debian 6.0 (squeeze) is \"squeeze\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:59 -msgid "Ubuntu 9.04 is \"jaunty\"" +msgid "Debian 5.0 (lenny) is \"lenny\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:60 -msgid "Ubuntu 8.10 is \"intrepid\"" +msgid "Ubuntu 10.10 is \"maverick\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:61 -msgid "Ubuntu 8.04 is \"hardy\"" +msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:62 -msgid "Debian Etch is \"etch\"" +msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:63 -msgid "Debian Lenny is \"lenny\"" +msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian.wml:64 +msgid "Ubuntu 6.06 is \"dapper\"" +msgstr "" + #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:66 +#: /home/runa/tor/website/docs/en/debian.wml:67 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:70 +#: /home/runa/tor/website/docs/en/debian.wml:71 #, no-wrap msgid "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:72 +#: /home/runa/tor/website/docs/en/debian.wml:73 msgid "" -"where you put the codename of your distribution (i.e. etch, lenny, sid, " -"maverick, lucid, karmic, jaunty, intrepid, hardy or whatever it is) in " -"place of <DISTRIBUTION>." +"where you put the codename of your distribution (i.e. lenny, sid, maverick " +"or whatever it is) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:78 +#: /home/runa/tor/website/docs/en/debian.wml:79 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:81 +#: /home/runa/tor/website/docs/en/debian.wml:82 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -166,14 +166,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:84 +#: /home/runa/tor/website/docs/en/debian.wml:85 msgid "" "Now refresh your sources and install Tor by running the following commands " "(as root) at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:87 +#: /home/runa/tor/website/docs/en/debian.wml:88 #, no-wrap msgid "" "apt-get update\n" @@ -181,7 +181,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:99 +#: /home/runa/tor/website/docs/en/debian.wml:100 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -191,19 +191,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:107 +#: /home/runa/tor/website/docs/en/debian.wml:108 msgid "<hr /> <a id=\"development\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:110 +#: /home/runa/tor/website/docs/en/debian.wml:111 msgid "" "<a class=\"anchor\" href=\"#development\">Option three: Using the " "development branch of Tor on Debian or Ubuntu</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:114 +#: /home/runa/tor/website/docs/en/debian.wml:115 msgid "" "If you want to use the <a href=\"<page download/download>#packagediff" "\">development branch</a> of Tor instead (more features and more bugs), you " @@ -212,7 +212,7 @@ msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:119 +#: /home/runa/tor/website/docs/en/debian.wml:120 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -220,20 +220,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:122 +#: /home/runa/tor/website/docs/en/debian.wml:123 msgid "" -"where you again substitute the name of your distro (etch, lenny, sid, " -"maverick, lucid, karmic, jaunty, intrepid, hardy) in place of <" -"DISTRIBUTION>." +"where you again substitute the name of your distro (lenny, sid, " +"maverick, ...) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:128 +#: /home/runa/tor/website/docs/en/debian.wml:129 msgid "Then run the following commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:130 +#: /home/runa/tor/website/docs/en/debian.wml:131 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -243,17 +242,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:143 +#: /home/runa/tor/website/docs/en/debian.wml:144 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:146 +#: /home/runa/tor/website/docs/en/debian.wml:147 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:150 +#: /home/runa/tor/website/docs/en/debian.wml:151 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -262,7 +261,7 @@ #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:153 +#: /home/runa/tor/website/docs/en/debian.wml:154 #, no-wrap msgid "" "\n" @@ -274,14 +273,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:160 +#: /home/runa/tor/website/docs/en/debian.wml:161 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Tor:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:163 +#: /home/runa/tor/website/docs/en/debian.wml:164 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts\n" @@ -289,12 +288,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:166 +#: /home/runa/tor/website/docs/en/debian.wml:167 msgid "Then you can build Tor in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:168 +#: /home/runa/tor/website/docs/en/debian.wml:169 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -305,23 +304,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:174 +#: /home/runa/tor/website/docs/en/debian.wml:175 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:176 +#: /home/runa/tor/website/docs/en/debian.wml:177 #, no-wrap msgid "sudo dpkg -i tor_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:186 +#: /home/runa/tor/website/docs/en/debian.wml:187 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:188 +#: /home/runa/tor/website/docs/en/debian.wml:189 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/templates/press/3-low.inthemedia.pot =================================================================== --- translation/trunk/projects/website/po/templates/press/3-low.inthemedia.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/press/3-low.inthemedia.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-12 12:20+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -44,23 +44,23 @@ msgstr "" #. type: Content of: <div><div><table><thead><tr><th> -#: /home/runa/tor/website/press/en/inthemedia.wml:27 /tmp/nRA6ZM91EX.xml:157 +#: /home/runa/tor/website/press/en/inthemedia.wml:27 /tmp/68fDHCZeZu.xml:157 msgid "Date" msgstr "" #. type: Content of: <div><div><table><thead><tr><th> -#: /home/runa/tor/website/press/en/inthemedia.wml:28 /tmp/nRA6ZM91EX.xml:158 +#: /home/runa/tor/website/press/en/inthemedia.wml:28 /tmp/68fDHCZeZu.xml:158 msgid "Publication" msgstr "" #. type: Content of: <div><div><table><thead><tr><th> -#: /home/runa/tor/website/press/en/inthemedia.wml:29 /tmp/nRA6ZM91EX.xml:159 +#: /home/runa/tor/website/press/en/inthemedia.wml:29 /tmp/68fDHCZeZu.xml:159 msgid "Topic" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:33 /tmp/nRA6ZM91EX.xml:170 -#: /tmp/nRA6ZM91EX.xml:177 /tmp/nRA6ZM91EX.xml:184 +#: /home/runa/tor/website/press/en/inthemedia.wml:33 /tmp/68fDHCZeZu.xml:177 +#: /tmp/68fDHCZeZu.xml:184 /tmp/68fDHCZeZu.xml:191 msgid "2011 January 31" msgstr "" @@ -78,8 +78,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:41 /tmp/nRA6ZM91EX.xml:48 -#: /tmp/nRA6ZM91EX.xml:191 +#: /home/runa/tor/website/press/en/inthemedia.wml:41 /tmp/68fDHCZeZu.xml:48 +#: /tmp/68fDHCZeZu.xml:198 msgid "2011 January 30" msgstr "" @@ -161,7 +161,7 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:71 /tmp/nRA6ZM91EX.xml:388 +#: /home/runa/tor/website/press/en/inthemedia.wml:71 /tmp/68fDHCZeZu.xml:395 msgid "2009 Apr 06" msgstr "" @@ -252,8 +252,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:98 /tmp/nRA6ZM91EX.xml:467 -#: /tmp/nRA6ZM91EX.xml:515 /tmp/nRA6ZM91EX.xml:802 +#: /home/runa/tor/website/press/en/inthemedia.wml:98 /tmp/68fDHCZeZu.xml:474 +#: /tmp/68fDHCZeZu.xml:522 /tmp/68fDHCZeZu.xml:809 msgid "PC World" msgstr "" @@ -300,8 +300,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:116 /tmp/nRA6ZM91EX.xml:123 -#: /tmp/nRA6ZM91EX.xml:652 /tmp/nRA6ZM91EX.xml:711 +#: /home/runa/tor/website/press/en/inthemedia.wml:116 /tmp/68fDHCZeZu.xml:123 +#: /tmp/68fDHCZeZu.xml:659 /tmp/68fDHCZeZu.xml:718 msgid "2006 Feb 15" msgstr "" @@ -352,8 +352,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:135 /tmp/nRA6ZM91EX.xml:374 -#: /tmp/nRA6ZM91EX.xml:690 +#: /home/runa/tor/website/press/en/inthemedia.wml:135 /tmp/68fDHCZeZu.xml:381 +#: /tmp/68fDHCZeZu.xml:697 msgid "New York Times" msgstr "" @@ -371,7 +371,7 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:141 /tmp/nRA6ZM91EX.xml:178 +#: /home/runa/tor/website/press/en/inthemedia.wml:141 /tmp/68fDHCZeZu.xml:185 msgid "New Scientist" msgstr "" @@ -402,28 +402,47 @@ #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/press/en/inthemedia.wml:163 -msgid "2011 February 01" +msgid "2011 February 17" msgstr "" #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/press/en/inthemedia.wml:164 -msgid "Discovery News" +msgid "Walpole Times" msgstr "" #. type: Content of: <div><div><table><tr><td> #: /home/runa/tor/website/press/en/inthemedia.wml:165 msgid "" +"<a href=\"http://www.wickedlocal.com/walpole/news/x95296113/Tor-Project-a-" +"Walpole-based-company-helps-Egyptians-avoid-Internet-censorship-during-" +"protests\">Tor Project, a Walpole-based company, helps Egyptians avoid " +"Internet censorship during protests</a>" +msgstr "" + +#. type: Content of: <div><div><table><tr><td> +#: /home/runa/tor/website/press/en/inthemedia.wml:170 +msgid "2011 February 01" +msgstr "" + +#. type: Content of: <div><div><table><tr><td> +#: /home/runa/tor/website/press/en/inthemedia.wml:171 +msgid "Discovery News" +msgstr "" + +#. type: Content of: <div><div><table><tr><td> +#: /home/runa/tor/website/press/en/inthemedia.wml:172 +msgid "" "<a href=\"http://news.discovery.com/tech/egypt-internet-online-" "protesters-110201.html\">Egypt's Internet Block Incomplete But Damaging</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:171 +#: /home/runa/tor/website/press/en/inthemedia.wml:178 msgid "IDG Poland" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:172 +#: /home/runa/tor/website/press/en/inthemedia.wml:179 msgid "" "<a href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci." "szukaja.alternatyw.html\">Egipt blokuje Internet, aktywiści szukają " @@ -431,19 +450,19 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:179 +#: /home/runa/tor/website/press/en/inthemedia.wml:186 msgid "" "<a href=\"http://www.newscientist.com/blogs/onepercent/2011/01/egypt-remains-" "officially-offli.html\">How Egypt is getting online</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:185 +#: /home/runa/tor/website/press/en/inthemedia.wml:192 msgid "El Pais" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:186 +#: /home/runa/tor/website/press/en/inthemedia.wml:193 msgid "" "<a href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/" "fax/elpepuint/20110130elpepuint_14/Tes\">Sortear la censura a golpe de fax</" @@ -451,12 +470,12 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:192 /tmp/nRA6ZM91EX.xml:304 +#: /home/runa/tor/website/press/en/inthemedia.wml:199 /tmp/68fDHCZeZu.xml:311 msgid "Boston Globe" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:193 +#: /home/runa/tor/website/press/en/inthemedia.wml:200 msgid "" "<a href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/" "mass_groups_software_helps_avoid_censorship/\">Foreign activists stay " @@ -464,29 +483,29 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:198 /tmp/nRA6ZM91EX.xml:205 +#: /home/runa/tor/website/press/en/inthemedia.wml:205 /tmp/68fDHCZeZu.xml:212 msgid "2011 January 29" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:199 +#: /home/runa/tor/website/press/en/inthemedia.wml:206 msgid "SvD.se" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:200 +#: /home/runa/tor/website/press/en/inthemedia.wml:207 msgid "" "<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for-" "natdissidenter_5902693.svd\">Tor öppnar dörrar för nätdissidenter</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:206 /tmp/nRA6ZM91EX.xml:359 +#: /home/runa/tor/website/press/en/inthemedia.wml:213 /tmp/68fDHCZeZu.xml:366 msgid "ComputerWorld" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:207 +#: /home/runa/tor/website/press/en/inthemedia.wml:214 msgid "" "<a href=\"http://www.computerworld.com/s/article/9207058/" "Without_Internet_Egyptians_find_new_ways_to_get_online?" @@ -494,17 +513,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:212 +#: /home/runa/tor/website/press/en/inthemedia.wml:219 msgid "2011 January 28" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:213 +#: /home/runa/tor/website/press/en/inthemedia.wml:220 msgid "Globe and Mail" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:214 +#: /home/runa/tor/website/press/en/inthemedia.wml:221 msgid "" "<a href=\"https://www.theglobeandmail.com/news/technology/in-a-span-of-" "minutes-a-country-goes-offline/article1887207/\">In a span of minutes, a " @@ -512,70 +531,70 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:219 +#: /home/runa/tor/website/press/en/inthemedia.wml:226 msgid "2010 December 22" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:220 /tmp/nRA6ZM91EX.xml:279 -#: /tmp/nRA6ZM91EX.xml:294 /tmp/nRA6ZM91EX.xml:349 /tmp/nRA6ZM91EX.xml:379 -#: /tmp/nRA6ZM91EX.xml:679 +#: /home/runa/tor/website/press/en/inthemedia.wml:227 /tmp/68fDHCZeZu.xml:286 +#: /tmp/68fDHCZeZu.xml:301 /tmp/68fDHCZeZu.xml:356 /tmp/68fDHCZeZu.xml:386 +#: /tmp/68fDHCZeZu.xml:686 msgid "Technology Review" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:221 +#: /home/runa/tor/website/press/en/inthemedia.wml:228 msgid "" "<a href=\"http://www.technologyreview.com/web/26981/\">Home Internet with " "Anonymity Built In</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:225 +#: /home/runa/tor/website/press/en/inthemedia.wml:232 msgid "2010 December 17" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:226 +#: /home/runa/tor/website/press/en/inthemedia.wml:233 msgid "New York Times Magazine" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:227 +#: /home/runa/tor/website/press/en/inthemedia.wml:234 msgid "" "<a href=\"https://www.nytimes.com/2010/12/19/magazine/19FOB-Medium-t.html" "\">Granting Anonymity</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:232 +#: /home/runa/tor/website/press/en/inthemedia.wml:239 msgid "2010 November 03" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:233 +#: /home/runa/tor/website/press/en/inthemedia.wml:240 msgid "metro sverige" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:234 +#: /home/runa/tor/website/press/en/inthemedia.wml:241 msgid "" "<a href=\"http://www.metro.se/2010/11/03/73897/sida-hjalper-utsatta-bli-" "anonyma-pa-n/\">Sida hjälper utsatta bli anonyma på nätet</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:239 +#: /home/runa/tor/website/press/en/inthemedia.wml:246 msgid "2010 August 01" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:240 +#: /home/runa/tor/website/press/en/inthemedia.wml:247 msgid "PC Format - Poland" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:241 +#: /home/runa/tor/website/press/en/inthemedia.wml:248 msgid "" "<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 " @@ -583,17 +602,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:246 +#: /home/runa/tor/website/press/en/inthemedia.wml:253 msgid "2010 July 14" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:247 +#: /home/runa/tor/website/press/en/inthemedia.wml:254 msgid "China Rights Forum" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:248 +#: /home/runa/tor/website/press/en/inthemedia.wml:255 msgid "" "<a href=\"http://www.hrichina.org/public/contents/category?" "cid=175033\">China Rights Forum, No. 2 - “China’s Internet”: Staking Digital " @@ -601,17 +620,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:254 +#: /home/runa/tor/website/press/en/inthemedia.wml:261 msgid "2010 May 25" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:255 +#: /home/runa/tor/website/press/en/inthemedia.wml:262 msgid "The Australian" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:256 +#: /home/runa/tor/website/press/en/inthemedia.wml:263 msgid "" "<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-" "network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor " @@ -619,51 +638,51 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:261 +#: /home/runa/tor/website/press/en/inthemedia.wml:268 msgid "2010 Mar 17" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:262 +#: /home/runa/tor/website/press/en/inthemedia.wml:269 msgid "PC World Poland" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:263 +#: /home/runa/tor/website/press/en/inthemedia.wml:270 msgid "" "<a href=\"http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html\">Anonymity " "in the Web</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:266 +#: /home/runa/tor/website/press/en/inthemedia.wml:273 msgid "2010 Mar 09" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:267 +#: /home/runa/tor/website/press/en/inthemedia.wml:274 msgid "PC Pro UK" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:268 +#: /home/runa/tor/website/press/en/inthemedia.wml:275 msgid "" "<a href=\"http://www.pcpro.co.uk/features/356254/the-dark-side-of-the-web" "\">The dark side of the web</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:271 +#: /home/runa/tor/website/press/en/inthemedia.wml:278 msgid "2009 Dec 29" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:272 +#: /home/runa/tor/website/press/en/inthemedia.wml:279 msgid "Times Online" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:273 +#: /home/runa/tor/website/press/en/inthemedia.wml:280 msgid "" "<a href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/" "article6969958.ece\">When Iran’s regime falls this will be remembered as the " @@ -671,46 +690,46 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:278 +#: /home/runa/tor/website/press/en/inthemedia.wml:285 msgid "2009 Oct 15" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:280 +#: /home/runa/tor/website/press/en/inthemedia.wml:287 msgid "" "<a href=\"http://www.technologyreview.com/web/23736/?a=f\">China Cracks Down " "on Tor Anonymity Network</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:283 +#: /home/runa/tor/website/press/en/inthemedia.wml:290 msgid "2009 Sep 30" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:284 +#: /home/runa/tor/website/press/en/inthemedia.wml:291 msgid "BusinessWeek" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:285 +#: /home/runa/tor/website/press/en/inthemedia.wml:292 msgid "" "<a href=\"http://www.businessweek.com/globalbiz/content/sep2009/" "gb20090930_620354.htm\">China's Online Censors Work Overtime</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:288 +#: /home/runa/tor/website/press/en/inthemedia.wml:295 msgid "2009 Aug 19" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:289 +#: /home/runa/tor/website/press/en/inthemedia.wml:296 msgid "Reuters" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:290 +#: /home/runa/tor/website/press/en/inthemedia.wml:297 msgid "" "<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?" "pageNumber=1&virtualBrandChannel=0&sp=true\">Web tools help protect " @@ -718,36 +737,36 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:293 +#: /home/runa/tor/website/press/en/inthemedia.wml:300 msgid "2009 Aug 10" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:295 +#: /home/runa/tor/website/press/en/inthemedia.wml:302 msgid "" "<a href=\"http://www.technologyreview.com/blog/editors/23958/?" "nlid=2255\">How to Build Anonymity Into the Internet</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:298 /tmp/nRA6ZM91EX.xml:303 +#: /home/runa/tor/website/press/en/inthemedia.wml:305 /tmp/68fDHCZeZu.xml:310 msgid "2009 Jul 26" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:299 /tmp/nRA6ZM91EX.xml:319 +#: /home/runa/tor/website/press/en/inthemedia.wml:306 /tmp/68fDHCZeZu.xml:326 msgid "Washington Times" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:300 +#: /home/runa/tor/website/press/en/inthemedia.wml:307 msgid "" "<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-" "dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:305 +#: /home/runa/tor/website/press/en/inthemedia.wml:312 msgid "" "<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/" "us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid " @@ -755,17 +774,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:308 +#: /home/runa/tor/website/press/en/inthemedia.wml:315 msgid "2009 Jul 24" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:309 +#: /home/runa/tor/website/press/en/inthemedia.wml:316 msgid "Associated Press" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:310 +#: /home/runa/tor/website/press/en/inthemedia.wml:317 msgid "" "<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-" "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown " @@ -773,29 +792,29 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:313 +#: /home/runa/tor/website/press/en/inthemedia.wml:320 msgid "2009 Jul 08" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:314 +#: /home/runa/tor/website/press/en/inthemedia.wml:321 msgid "Tehran Bureau" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:315 +#: /home/runa/tor/website/press/en/inthemedia.wml:322 msgid "" "<a href=\"http://tehranbureau.com/geeks-globe-rally-iranians-online/\">Geeks " "Around the Globe Rally to Help Iranians Online</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:318 +#: /home/runa/tor/website/press/en/inthemedia.wml:325 msgid "2009 Jun 26" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:320 +#: /home/runa/tor/website/press/en/inthemedia.wml:327 msgid "" "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-" "navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian " @@ -803,70 +822,70 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:323 +#: /home/runa/tor/website/press/en/inthemedia.wml:330 msgid "2009 Jun 29" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:324 +#: /home/runa/tor/website/press/en/inthemedia.wml:331 msgid "EFF" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:325 +#: /home/runa/tor/website/press/en/inthemedia.wml:332 msgid "" "<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-" "relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor Relay</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:328 +#: /home/runa/tor/website/press/en/inthemedia.wml:335 msgid "2009 Jun 24" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:329 +#: /home/runa/tor/website/press/en/inthemedia.wml:336 msgid "Daily Finance" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:330 +#: /home/runa/tor/website/press/en/inthemedia.wml:337 msgid "" "<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-" "controversy/\">Nokia and Siemens in Iran controversy</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:333 /tmp/nRA6ZM91EX.xml:343 -#: /tmp/nRA6ZM91EX.xml:348 +#: /home/runa/tor/website/press/en/inthemedia.wml:340 /tmp/68fDHCZeZu.xml:350 +#: /tmp/68fDHCZeZu.xml:355 msgid "2009 Jun 18" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:334 /tmp/nRA6ZM91EX.xml:399 -#: /tmp/nRA6ZM91EX.xml:666 +#: /home/runa/tor/website/press/en/inthemedia.wml:341 /tmp/68fDHCZeZu.xml:406 +#: /tmp/68fDHCZeZu.xml:673 msgid "Wall Street Journal" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:335 +#: /home/runa/tor/website/press/en/inthemedia.wml:342 msgid "" "<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-" "anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:338 +#: /home/runa/tor/website/press/en/inthemedia.wml:345 msgid "2009 Jun 19" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:339 +#: /home/runa/tor/website/press/en/inthemedia.wml:346 msgid "O'Reilly Radar" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:340 +#: /home/runa/tor/website/press/en/inthemedia.wml:347 msgid "" "<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-runnin." "html\">Dramatic Increase in Number of Tor Clients from Iran: Interview with " @@ -874,43 +893,43 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:344 +#: /home/runa/tor/website/press/en/inthemedia.wml:351 msgid "Deutsche Welle" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:345 +#: /home/runa/tor/website/press/en/inthemedia.wml:352 msgid "" "<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\">Internet " "proxies let Iranians and others connect to blocked Web sites</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:350 +#: /home/runa/tor/website/press/en/inthemedia.wml:357 msgid "" "<a href=\"http://www.technologyreview.com/web/22893/\">The Web vs. the " "Republic of Iran</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:353 /tmp/nRA6ZM91EX.xml:358 +#: /home/runa/tor/website/press/en/inthemedia.wml:360 /tmp/68fDHCZeZu.xml:365 msgid "2009 Jun 17" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:354 +#: /home/runa/tor/website/press/en/inthemedia.wml:361 msgid "CNet News" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:355 +#: /home/runa/tor/website/press/en/inthemedia.wml:362 msgid "" "<a href=\"http://news.cnet.com/8301-13578_3-10267287-38.html\">Iranians find " "ways to bypass Net censors</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:360 +#: /home/runa/tor/website/press/en/inthemedia.wml:367 msgid "" "<a href=\"http://www.computerworld.com/action/article.do?" "command=viewArticleBasic&articleId=9134471&intsrc=news_ts_head" @@ -918,34 +937,34 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:363 +#: /home/runa/tor/website/press/en/inthemedia.wml:370 msgid "2009 May 29" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:364 /tmp/nRA6ZM91EX.xml:384 +#: /home/runa/tor/website/press/en/inthemedia.wml:371 /tmp/68fDHCZeZu.xml:391 msgid "Le Monde" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:365 +#: /home/runa/tor/website/press/en/inthemedia.wml:372 msgid "" "<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-" "censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:368 +#: /home/runa/tor/website/press/en/inthemedia.wml:375 msgid "2009 May 15" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:369 +#: /home/runa/tor/website/press/en/inthemedia.wml:376 msgid "Mass High Tech" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:370 +#: /home/runa/tor/website/press/en/inthemedia.wml:377 msgid "" "<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-" "tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net privacy</" @@ -953,24 +972,24 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:373 +#: /home/runa/tor/website/press/en/inthemedia.wml:380 msgid "2009 May 01" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:375 +#: /home/runa/tor/website/press/en/inthemedia.wml:382 msgid "" "<a href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html" "\">Iranians and Others Outwit Net Censors</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:378 +#: /home/runa/tor/website/press/en/inthemedia.wml:385 msgid "2009 Apr 23" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:380 +#: /home/runa/tor/website/press/en/inthemedia.wml:387 msgid "" "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent " "Made Safer: How anonymity technology could save free speech on the Internet." @@ -978,189 +997,189 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:383 +#: /home/runa/tor/website/press/en/inthemedia.wml:390 msgid "2009 Apr 22" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:385 +#: /home/runa/tor/website/press/en/inthemedia.wml:392 msgid "" "<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-la-" "cybersurveillance/\">How to circumvent cybersurveillance</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:389 +#: /home/runa/tor/website/press/en/inthemedia.wml:396 msgid "Reader's Digest" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:390 +#: /home/runa/tor/website/press/en/inthemedia.wml:397 msgid "" "<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-anything/" "article122219.html\">How to Hide Anything</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:393 +#: /home/runa/tor/website/press/en/inthemedia.wml:400 msgid "2009 Mar 18" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:394 +#: /home/runa/tor/website/press/en/inthemedia.wml:401 msgid "Marie Claire" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:395 +#: /home/runa/tor/website/press/en/inthemedia.wml:402 msgid "" "<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-" "online--web-image\">How to Manage Your Web Footprint</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:398 +#: /home/runa/tor/website/press/en/inthemedia.wml:405 msgid "2009 Mar 13" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:400 +#: /home/runa/tor/website/press/en/inthemedia.wml:407 msgid "" "<a href=\"http://online.wsj.com/article/SB123567809587886053.html\">The " "Kindness of Strangers</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:405 +#: /home/runa/tor/website/press/en/inthemedia.wml:412 msgid "2009 Mar 03" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:406 +#: /home/runa/tor/website/press/en/inthemedia.wml:413 msgid "Orf Austria" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:407 +#: /home/runa/tor/website/press/en/inthemedia.wml:414 msgid "" "<a href=\"http://futurezone.orf.at/stories/1503028/\">WIRTSCHAFTSKAMMER " "column</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:410 +#: /home/runa/tor/website/press/en/inthemedia.wml:417 msgid "2009 Feb 18" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:411 /tmp/nRA6ZM91EX.xml:583 +#: /home/runa/tor/website/press/en/inthemedia.wml:418 /tmp/68fDHCZeZu.xml:590 msgid "Bangkok Post" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:412 +#: /home/runa/tor/website/press/en/inthemedia.wml:419 msgid "" "<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404-" "not-found-routine\">The old fake \"404 not found\" routine</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:415 +#: /home/runa/tor/website/press/en/inthemedia.wml:422 msgid "2008 Dec 14" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:416 +#: /home/runa/tor/website/press/en/inthemedia.wml:423 msgid "PC Magazine: Middle & Near East" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:417 +#: /home/runa/tor/website/press/en/inthemedia.wml:424 msgid "" "<a href=\"http://www.pcmag-mideast.com/FeatureDetail.aspx?ID=1039\">How To " "Reclaim Your Online Privacy</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:422 +#: /home/runa/tor/website/press/en/inthemedia.wml:429 msgid "2008 Aug 21" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:423 +#: /home/runa/tor/website/press/en/inthemedia.wml:430 msgid "CNN" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:424 +#: /home/runa/tor/website/press/en/inthemedia.wml:431 msgid "" "<a href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html" "\">Experts: Internet filtering and censorship rife</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:429 +#: /home/runa/tor/website/press/en/inthemedia.wml:436 msgid "2008 Aug 22" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:430 +#: /home/runa/tor/website/press/en/inthemedia.wml:437 msgid "The Sydney Morning Herald" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:431 +#: /home/runa/tor/website/press/en/inthemedia.wml:438 msgid "" "<a href=\"http://www.smh.com.au/news/web/the-china-" "syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:436 +#: /home/runa/tor/website/press/en/inthemedia.wml:443 msgid "2008 Aug 20" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:437 +#: /home/runa/tor/website/press/en/inthemedia.wml:444 msgid "Scientific American" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:438 +#: /home/runa/tor/website/press/en/inthemedia.wml:445 msgid "" "<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-" "secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:443 +#: /home/runa/tor/website/press/en/inthemedia.wml:450 msgid "2008 Aug 05" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:444 +#: /home/runa/tor/website/press/en/inthemedia.wml:451 msgid "Guardian UK" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:445 +#: /home/runa/tor/website/press/en/inthemedia.wml:452 msgid "" "<a href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china." "censorship\">Vaulting the great firewall</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:450 +#: /home/runa/tor/website/press/en/inthemedia.wml:457 msgid "2008 Aug 10" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:451 +#: /home/runa/tor/website/press/en/inthemedia.wml:458 msgid "Tech Radar UK" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:452 +#: /home/runa/tor/website/press/en/inthemedia.wml:459 msgid "" "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-" "highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese " @@ -1168,25 +1187,25 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:458 /tmp/nRA6ZM91EX.xml:466 -#: /tmp/nRA6ZM91EX.xml:474 /tmp/nRA6ZM91EX.xml:482 +#: /home/runa/tor/website/press/en/inthemedia.wml:465 /tmp/68fDHCZeZu.xml:473 +#: /tmp/68fDHCZeZu.xml:481 /tmp/68fDHCZeZu.xml:489 msgid "2008 Aug 07" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:459 +#: /home/runa/tor/website/press/en/inthemedia.wml:466 msgid "Spiegel" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:460 +#: /home/runa/tor/website/press/en/inthemedia.wml:467 msgid "" "<a href=\"http://www.spiegel.de/netzwelt/tech/0,1518,570421,00.html\">Tricks " "gegen Zensur und Überwachung</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:468 +#: /home/runa/tor/website/press/en/inthemedia.wml:475 msgid "" "<a href=\"http://www.pcworld.com/" "article/149399-3/15_great_free_privacy_downloads.html\">15 Great, Free " @@ -1194,41 +1213,41 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:475 +#: /home/runa/tor/website/press/en/inthemedia.wml:482 msgid "The Guardian UK" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:476 +#: /home/runa/tor/website/press/en/inthemedia.wml:483 msgid "" "<a href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking" "\">Chaos aims to crack China's wall</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:483 +#: /home/runa/tor/website/press/en/inthemedia.wml:490 msgid "The Register UK" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:484 +#: /home/runa/tor/website/press/en/inthemedia.wml:491 msgid "" "<a href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/" "\">German hackers poke hole in great firewall of China</a>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:490 +#: /home/runa/tor/website/press/en/inthemedia.wml:497 msgid "2008 May 24" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:491 +#: /home/runa/tor/website/press/en/inthemedia.wml:498 msgid "Groupo Estado" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:492 +#: /home/runa/tor/website/press/en/inthemedia.wml:499 msgid "" "<a href=\"http://blog.estadao.com.br/blog/cruz/?" "title=cfp08_navegacao_anonima_na_rede&more=1&c=1&tb=1&" @@ -1237,17 +1256,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:498 +#: /home/runa/tor/website/press/en/inthemedia.wml:505 msgid "2008 Mar 12" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:499 +#: /home/runa/tor/website/press/en/inthemedia.wml:506 msgid "SearchSecurity.com" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:500 +#: /home/runa/tor/website/press/en/inthemedia.wml:507 msgid "" "<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142," "sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>. " @@ -1256,29 +1275,29 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:507 +#: /home/runa/tor/website/press/en/inthemedia.wml:514 msgid "2008 Feb 14" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:508 +#: /home/runa/tor/website/press/en/inthemedia.wml:515 msgid "Wired: Compiler Blog" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:509 +#: /home/runa/tor/website/press/en/inthemedia.wml:516 msgid "" "<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\"> " "How To: Set Up Anonymous Browsing in 30 Seconds or Less</a>." msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:514 +#: /home/runa/tor/website/press/en/inthemedia.wml:521 msgid "2008 Feb 01" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:516 +#: /home/runa/tor/website/press/en/inthemedia.wml:523 msgid "" "<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=" @@ -1290,17 +1309,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:524 +#: /home/runa/tor/website/press/en/inthemedia.wml:531 msgid "2007 Sep 21" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:525 +#: /home/runa/tor/website/press/en/inthemedia.wml:532 msgid "Wired HowTo Blog" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:526 +#: /home/runa/tor/website/press/en/inthemedia.wml:533 msgid "" "<a href=\"http://howto.wired.com/wiredhowtos/index.cgi?" "page_name=be_a_whistle_blower;action=display;category=Work\"> Be a " @@ -1309,17 +1328,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:532 +#: /home/runa/tor/website/press/en/inthemedia.wml:539 msgid "2007 Sep 16" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:533 +#: /home/runa/tor/website/press/en/inthemedia.wml:540 msgid "Cnet" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:534 +#: /home/runa/tor/website/press/en/inthemedia.wml:541 msgid "" "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\"> Tor anonymity " "server admin arrested</a>. A Tor exit node operator from Germany was " @@ -1334,18 +1353,18 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:543 +#: /home/runa/tor/website/press/en/inthemedia.wml:550 msgid "2007 Sep 10" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:544 /tmp/nRA6ZM91EX.xml:725 -#: /tmp/nRA6ZM91EX.xml:858 /tmp/nRA6ZM91EX.xml:1057 /tmp/nRA6ZM91EX.xml:1080 +#: /home/runa/tor/website/press/en/inthemedia.wml:551 /tmp/68fDHCZeZu.xml:732 +#: /tmp/68fDHCZeZu.xml:865 /tmp/68fDHCZeZu.xml:1064 /tmp/68fDHCZeZu.xml:1087 msgid "Wired" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:545 +#: /home/runa/tor/website/press/en/inthemedia.wml:552 msgid "" "<a href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks" "\"> Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise</a><br/> " @@ -1378,17 +1397,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:572 +#: /home/runa/tor/website/press/en/inthemedia.wml:579 msgid "2007 Jul 27" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:573 +#: /home/runa/tor/website/press/en/inthemedia.wml:580 msgid "Wired Blog" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:574 +#: /home/runa/tor/website/press/en/inthemedia.wml:581 msgid "" "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\"> " "Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a href=\"http://" @@ -1399,12 +1418,12 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:582 +#: /home/runa/tor/website/press/en/inthemedia.wml:589 msgid "2007 Jun 22" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:584 +#: /home/runa/tor/website/press/en/inthemedia.wml:591 msgid "" "<a href=\"http://www.asiamedia.ucla.edu/article-southeastasia.asp?" "parentid=72388\"> The problems with censorship</a>. Mentions anecdotes that " @@ -1412,17 +1431,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:590 +#: /home/runa/tor/website/press/en/inthemedia.wml:597 msgid "2007 Mar 15" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:591 +#: /home/runa/tor/website/press/en/inthemedia.wml:598 msgid "World Changing" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:592 +#: /home/runa/tor/website/press/en/inthemedia.wml:599 msgid "" "<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogging " "Where Speech Isn’t Free</a><br/> Coverage of former Tor Executive Director " @@ -1432,17 +1451,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:601 +#: /home/runa/tor/website/press/en/inthemedia.wml:608 msgid "2007 Mar 8" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:602 +#: /home/runa/tor/website/press/en/inthemedia.wml:609 msgid "Security Focus" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:603 +#: /home/runa/tor/website/press/en/inthemedia.wml:610 msgid "" "<a href=\"http://www.securityfocus.com/news/11447/1\"> Tor hack proposed to " "catch criminals</a>. Coverage of a toolset called \"Torment\" for " @@ -1451,17 +1470,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:611 +#: /home/runa/tor/website/press/en/inthemedia.wml:618 msgid "2007 Feb 1" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:612 +#: /home/runa/tor/website/press/en/inthemedia.wml:619 msgid "Dr Dobb's" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:613 +#: /home/runa/tor/website/press/en/inthemedia.wml:620 msgid "" "<a href=\"http://www.ddj.com/security/197002414\"> Tor Project Protects " "Anonymous Sources</a>. An introduction to Tor, including technical and " @@ -1469,17 +1488,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:620 +#: /home/runa/tor/website/press/en/inthemedia.wml:627 msgid "2006 Oct 19" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:621 +#: /home/runa/tor/website/press/en/inthemedia.wml:628 msgid "Wired Threat Level" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:622 +#: /home/runa/tor/website/press/en/inthemedia.wml:629 msgid "" "<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\"> " "The Onion Router (TOR) is Leaky (Leeky)</a>. Explains why you need " @@ -1489,17 +1508,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:632 +#: /home/runa/tor/website/press/en/inthemedia.wml:639 msgid "2006 Aug 18" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:633 /tmp/nRA6ZM91EX.xml:736 +#: /home/runa/tor/website/press/en/inthemedia.wml:640 /tmp/68fDHCZeZu.xml:743 msgid "NPR" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:634 +#: /home/runa/tor/website/press/en/inthemedia.wml:641 msgid "" "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> " "Tips for Protecting Privacy Online</a>. Kevin Bankston of the EFF " @@ -1508,17 +1527,17 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:642 +#: /home/runa/tor/website/press/en/inthemedia.wml:649 msgid "2006 Jul 5" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:643 +#: /home/runa/tor/website/press/en/inthemedia.wml:650 msgid "MSNBC" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:644 +#: /home/runa/tor/website/press/en/inthemedia.wml:651 msgid "" "<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\"> Defending " "liberties in high-tech world</a>. Mentions EFF funding for Tor as one of " @@ -1526,12 +1545,12 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:655 +#: /home/runa/tor/website/press/en/inthemedia.wml:662 msgid "Network Secure" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:656 +#: /home/runa/tor/website/press/en/inthemedia.wml:663 msgid "" "<a href=\"http://www.network-secure.de/index.php?option=com_content&" "task=view&id=3909\"> Tor: Anonymisierungswerkzeug entwickelt</a> (German)" @@ -1539,12 +1558,12 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:663 +#: /home/runa/tor/website/press/en/inthemedia.wml:670 msgid "2006 Feb 13" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:667 +#: /home/runa/tor/website/press/en/inthemedia.wml:674 msgid "" "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chinese " "Censors Of Internet Face 'Hacktivists' in U.S.</a><br/> Full article text " @@ -1553,41 +1572,41 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:676 +#: /home/runa/tor/website/press/en/inthemedia.wml:683 msgid "2006 Jan 31" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:680 +#: /home/runa/tor/website/press/en/inthemedia.wml:687 msgid "" "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\"> Evading " "the Google Eye</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:687 +#: /home/runa/tor/website/press/en/inthemedia.wml:694 msgid "2006 Jan 29" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:691 +#: /home/runa/tor/website/press/en/inthemedia.wml:698 msgid "" "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\"> How " "to Outwit the World's Internet Censors</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:698 +#: /home/runa/tor/website/press/en/inthemedia.wml:705 msgid "2006 Jan 23" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:701 +#: /home/runa/tor/website/press/en/inthemedia.wml:708 msgid "NPR Talk of the Nation" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:702 +#: /home/runa/tor/website/press/en/inthemedia.wml:709 msgid "" "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> " "Search Engines and Privacy Rights on the Web</a><br/> <a href=\"http://xeni." @@ -1595,99 +1614,99 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:714 +#: /home/runa/tor/website/press/en/inthemedia.wml:721 msgid "Punto Informatico" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:715 +#: /home/runa/tor/website/press/en/inthemedia.wml:722 msgid "" "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\"> TOR c'è</a> " "(Italian)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:722 /tmp/nRA6ZM91EX.xml:733 +#: /home/runa/tor/website/press/en/inthemedia.wml:729 /tmp/68fDHCZeZu.xml:740 msgid "2006 Jan 20" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:726 +#: /home/runa/tor/website/press/en/inthemedia.wml:733 msgid "" "<a href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?" "currentPage=2\"> How to Foil Search Engine Snoops</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:737 +#: /home/runa/tor/website/press/en/inthemedia.wml:744 msgid "" "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\"> " "Google Records Subpoena Raises Privacy Fears</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:744 +#: /home/runa/tor/website/press/en/inthemedia.wml:751 msgid "2005 Sep 30" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:747 +#: /home/runa/tor/website/press/en/inthemedia.wml:754 msgid "Viva o Linux" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:748 +#: /home/runa/tor/website/press/en/inthemedia.wml:755 msgid "" "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\"> " "TOR: A Internet sem rastreabilidade</a> (Portuguese)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:755 +#: /home/runa/tor/website/press/en/inthemedia.wml:762 msgid "2005 Jul 12" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:758 +#: /home/runa/tor/website/press/en/inthemedia.wml:765 msgid "IEEE Computer Society's Technical Committee on Security and Privacy" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:759 +#: /home/runa/tor/website/press/en/inthemedia.wml:766 msgid "" "<a href=\"http://www.ieee-security.org/Cipher/Newsbriefs/2005/071805.html#TOR" "\"> Onion routing application Tor makes PCWorld's top 100</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:766 +#: /home/runa/tor/website/press/en/inthemedia.wml:773 msgid "2005 Jun 22" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:769 +#: /home/runa/tor/website/press/en/inthemedia.wml:776 msgid "The Unofficial Apple Blog" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:770 +#: /home/runa/tor/website/press/en/inthemedia.wml:777 msgid "" "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\"> Privacy " "Watch: Tor</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:777 +#: /home/runa/tor/website/press/en/inthemedia.wml:784 msgid "2005 Jun 10" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:780 +#: /home/runa/tor/website/press/en/inthemedia.wml:787 msgid "The New Zealand Herald" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:781 +#: /home/runa/tor/website/press/en/inthemedia.wml:788 msgid "" "<a href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&" "objectid=10329896\"> China's internet censorship stranglehold can't last</" @@ -1695,104 +1714,104 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:788 +#: /home/runa/tor/website/press/en/inthemedia.wml:795 msgid "2005 Jun 8" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:791 +#: /home/runa/tor/website/press/en/inthemedia.wml:798 msgid "American Public Radio" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:792 +#: /home/runa/tor/website/press/en/inthemedia.wml:799 msgid "" "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\"> " "An Internet privacy tool called \"Tor\"</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:799 /tmp/nRA6ZM91EX.xml:811 +#: /home/runa/tor/website/press/en/inthemedia.wml:806 /tmp/68fDHCZeZu.xml:818 msgid "2005 Jun 1" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:803 +#: /home/runa/tor/website/press/en/inthemedia.wml:810 msgid "" "<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\"> " "The 100 Best Products of 2005</a><br/> Tor is ranked #40 on the list." msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:814 +#: /home/runa/tor/website/press/en/inthemedia.wml:821 msgid "Linux Weekly News" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:815 +#: /home/runa/tor/website/press/en/inthemedia.wml:822 msgid "" "<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router (Tor)" "</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:822 +#: /home/runa/tor/website/press/en/inthemedia.wml:829 msgid "2005 May 22" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:825 /tmp/nRA6ZM91EX.xml:981 +#: /home/runa/tor/website/press/en/inthemedia.wml:832 /tmp/68fDHCZeZu.xml:988 msgid "Slashdot" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:826 +#: /home/runa/tor/website/press/en/inthemedia.wml:833 msgid "" "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\"> Tor " "Anonymity Network Reaches 100 Verified Nodes</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:833 +#: /home/runa/tor/website/press/en/inthemedia.wml:840 msgid "2005 May 20" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:836 +#: /home/runa/tor/website/press/en/inthemedia.wml:843 msgid "Security.uz" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:837 +#: /home/runa/tor/website/press/en/inthemedia.wml:844 msgid "" "<a href=\"http://security.uz/news/default.asp?id=10541\"> Tor - мощный " "анонимайзер для всех ОС</a> (Russian)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:844 +#: /home/runa/tor/website/press/en/inthemedia.wml:851 msgid "2005 May 19" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:847 +#: /home/runa/tor/website/press/en/inthemedia.wml:854 msgid "WebPlanet" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:848 +#: /home/runa/tor/website/press/en/inthemedia.wml:855 msgid "" "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\"> Tor: " "распределенная система анонимного серфинга</a> (Russian)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:855 /tmp/nRA6ZM91EX.xml:868 +#: /home/runa/tor/website/press/en/inthemedia.wml:862 /tmp/68fDHCZeZu.xml:875 msgid "2005 May 17" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:859 +#: /home/runa/tor/website/press/en/inthemedia.wml:866 msgid "" "<a href=\"http://www.wired.com/politics/security/news/2005/05/67542?" "currentPage=all\"> Tor Torches Online Tracking</a><br/> Also available in <a " @@ -1800,170 +1819,170 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:871 +#: /home/runa/tor/website/press/en/inthemedia.wml:878 msgid "XBiz" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:872 +#: /home/runa/tor/website/press/en/inthemedia.wml:879 msgid "" "<a href=\"http://xbiz.com/news/8761\"> Navy Project Allows Anonymous " "Browsing</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:879 +#: /home/runa/tor/website/press/en/inthemedia.wml:886 msgid "2005 Apr 13" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:882 +#: /home/runa/tor/website/press/en/inthemedia.wml:889 msgid "Heise online" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:883 +#: /home/runa/tor/website/press/en/inthemedia.wml:890 msgid "" "<a href=\"http://www.heise.de/newsticker/meldung/58506\"> CFP: Vom " "kafkaesken Schwinden der Anonymität</a> (German)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:890 +#: /home/runa/tor/website/press/en/inthemedia.wml:897 msgid "2005 Apr 5" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:893 +#: /home/runa/tor/website/press/en/inthemedia.wml:900 msgid "Libero" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:894 +#: /home/runa/tor/website/press/en/inthemedia.wml:901 msgid "" "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\"> " "Anonimato on line, ecco Tor</a> (Italian)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:901 +#: /home/runa/tor/website/press/en/inthemedia.wml:908 msgid "2005 Jan 4" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:904 +#: /home/runa/tor/website/press/en/inthemedia.wml:911 msgid "Internetnews" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:905 +#: /home/runa/tor/website/press/en/inthemedia.wml:912 msgid "" "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\"> EFF " "Throws Support to 'Anonymous' Internet Project</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:912 +#: /home/runa/tor/website/press/en/inthemedia.wml:919 msgid "2005 Mar 31" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:915 +#: /home/runa/tor/website/press/en/inthemedia.wml:922 msgid "Linux.com" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:916 +#: /home/runa/tor/website/press/en/inthemedia.wml:923 msgid "" "<a href=\"http://www.linux.com/articles/43713?tid=19&tid=78\"> Securing " "your online privacy with Tor</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:923 +#: /home/runa/tor/website/press/en/inthemedia.wml:930 msgid "2004 Dec 27" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:926 +#: /home/runa/tor/website/press/en/inthemedia.wml:933 msgid "BoingBoing" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:927 +#: /home/runa/tor/website/press/en/inthemedia.wml:934 msgid "" "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\"> " "EFF helping produce anonymizing software</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:934 +#: /home/runa/tor/website/press/en/inthemedia.wml:941 msgid "2004 Dec 25" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:937 +#: /home/runa/tor/website/press/en/inthemedia.wml:944 msgid "Kansas City infozine" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:938 +#: /home/runa/tor/website/press/en/inthemedia.wml:945 msgid "" "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\"> " "EFF Joins Forces with Tor Software Project</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:945 /tmp/nRA6ZM91EX.xml:956 +#: /home/runa/tor/website/press/en/inthemedia.wml:952 /tmp/68fDHCZeZu.xml:963 msgid "2004 Dec 23" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:948 +#: /home/runa/tor/website/press/en/inthemedia.wml:955 msgid "golem.de" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:949 +#: /home/runa/tor/website/press/en/inthemedia.wml:956 msgid "" "<a href=\"http://www.golem.de/0412/35340.html\"> EFF unterstützt " "Anonymisierer Tor</a> (German)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:959 +#: /home/runa/tor/website/press/en/inthemedia.wml:966 msgid "SuicideGirls" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:960 +#: /home/runa/tor/website/press/en/inthemedia.wml:967 msgid "" "<a href=\"http://suicidegirls.com/news/technology/6150/\"> New Routing " "Software Allows Anonymous Internet Use</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:967 +#: /home/runa/tor/website/press/en/inthemedia.wml:974 msgid "2004 Dec 18" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:970 +#: /home/runa/tor/website/press/en/inthemedia.wml:977 msgid "P2Pnet" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:971 +#: /home/runa/tor/website/press/en/inthemedia.wml:978 msgid "<a href=\"http://p2pnet.net/story/3357\"> EFF to sponsor Tor</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:978 +#: /home/runa/tor/website/press/en/inthemedia.wml:985 msgid "2004 Dec 22" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:982 +#: /home/runa/tor/website/press/en/inthemedia.wml:989 msgid "" "<a href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&" "tid=95&tid=158&tid=153&tid=17\"> EFF Promotes Freenet-like " @@ -1971,108 +1990,108 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:989 +#: /home/runa/tor/website/press/en/inthemedia.wml:996 msgid "2004 Nov 16" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:992 +#: /home/runa/tor/website/press/en/inthemedia.wml:999 msgid "AlterNet" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:993 +#: /home/runa/tor/website/press/en/inthemedia.wml:1000 msgid "" "<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy Traffic</" "a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1000 +#: /home/runa/tor/website/press/en/inthemedia.wml:1007 msgid "2004 Aug 30" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1003 +#: /home/runa/tor/website/press/en/inthemedia.wml:1010 msgid "Newsweek" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1004 +#: /home/runa/tor/website/press/en/inthemedia.wml:1011 msgid "Technology: Instant Security (no link)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1010 +#: /home/runa/tor/website/press/en/inthemedia.wml:1017 msgid "2004 Aug 16" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1013 +#: /home/runa/tor/website/press/en/inthemedia.wml:1020 msgid "Eweek" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1014 +#: /home/runa/tor/website/press/en/inthemedia.wml:1021 msgid "" "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-" "Tools/\"> Don't Fear Internet Anonymity Tools</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1021 -#: /tmp/nRA6ZM91EX.xml:1032 +#: /home/runa/tor/website/press/en/inthemedia.wml:1028 +#: /tmp/68fDHCZeZu.xml:1039 msgid "2004 Aug 6" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1024 +#: /home/runa/tor/website/press/en/inthemedia.wml:1031 msgid "HCC magazine" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1025 +#: /home/runa/tor/website/press/en/inthemedia.wml:1032 msgid "" "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\"> Anoniem surfen met " "hulp van marine VS</a> (Dutch)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1035 +#: /home/runa/tor/website/press/en/inthemedia.wml:1042 msgid "Golem" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1036 +#: /home/runa/tor/website/press/en/inthemedia.wml:1043 msgid "" "<a href=\"http://www.golem.de/0408/32835.html\"> Tor: Anonymisierer nutzt " "Onion-Routing</a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1043 +#: /home/runa/tor/website/press/en/inthemedia.wml:1050 msgid "2004 Aug 5" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1046 +#: /home/runa/tor/website/press/en/inthemedia.wml:1053 msgid "Network World Security" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1047 +#: /home/runa/tor/website/press/en/inthemedia.wml:1054 msgid "" "<a href=\"http://www.networkworld.com/details/7088.html\"> Onion routing</" "a><br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1054 +#: /home/runa/tor/website/press/en/inthemedia.wml:1061 msgid "2004 May 8" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1058 +#: /home/runa/tor/website/press/en/inthemedia.wml:1065 msgid "" "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion " "Routing Averts Prying Eyes</a><br/> Also in <a href=\"http://hotwired.goo.ne." @@ -2080,29 +2099,29 @@ msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1066 +#: /home/runa/tor/website/press/en/inthemedia.wml:1073 msgid "2004 Mar 8" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1069 +#: /home/runa/tor/website/press/en/inthemedia.wml:1076 msgid "CNET Japan blog" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1070 +#: /home/runa/tor/website/press/en/inthemedia.wml:1077 msgid "" "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\"> " "Yearning of hackers and insecurity</a> (Japanese)<br/>" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1077 +#: /home/runa/tor/website/press/en/inthemedia.wml:1084 msgid "1999 Apr 13" msgstr "" #. type: Content of: <div><div><table><tr><td> -#: /home/runa/tor/website/press/en/inthemedia.wml:1081 +#: /home/runa/tor/website/press/en/inthemedia.wml:1088 msgid "" "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\"> " "Anonymous Web Surfing? Uh-Uh</a><br/>" Modified: translation/trunk/projects/website/po/templates/press/3-low.press.pot =================================================================== --- translation/trunk/projects/website/po/templates/press/3-low.press.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/press/3-low.press.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-12-26 14:32+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -17,24 +17,24 @@ "Content-Transfer-Encoding: 8bit\n" #. type: Content of: <div><div> -#: /home/runa/transifex/website/press/en/press.wml:8 +#: /home/runa/tor/website/press/en/press.wml:8 msgid "" "<a href=\"<page index>\">Home » </a> <a href=\"<page press/press>" "\">Press</a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/transifex/website/press/en/press.wml:13 +#: /home/runa/tor/website/press/en/press.wml:13 msgid "Tor Press and Media Information" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/transifex/website/press/en/press.wml:16 +#: /home/runa/tor/website/press/en/press.wml:16 msgid "Press Releases" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/transifex/website/press/en/press.wml:18 +#: /home/runa/tor/website/press/en/press.wml:18 msgid "" "16 September 2010. Tor announces an article discussing <a href=\"<page " "press/2010-09-16-ten-things-circumvention-tools>\">Ten Things to Look for in " @@ -42,59 +42,59 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/transifex/website/press/en/press.wml:19 +#: /home/runa/tor/website/press/en/press.wml:19 msgid "" "25 March 2010. Tor and Printfection launch <a href=\"<page press/2010-03-25-" "tor-store-press-release>\">The Tor Store</a>." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/transifex/website/press/en/press.wml:20 +#: /home/runa/tor/website/press/en/press.wml:20 msgid "" "12 March 2009. Tor launches a <a href=\"<page press/2009-03-12-performance-" "roadmap-press-release>\">performance roadmap</a> and campaign." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/transifex/website/press/en/press.wml:21 +#: /home/runa/tor/website/press/en/press.wml:21 msgid "" "19 December 2008. Tor announces 3-year <a href=\"<page press/2008-12-19-" "roadmap-press-release>\">development roadmap</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/press/en/press.wml:24 +#: /home/runa/tor/website/press/en/press.wml:24 msgid "<br>" msgstr "" #. type: Content of: <div><div><div><h3> -#: /home/runa/transifex/website/press/en/press.wml:26 +#: /home/runa/tor/website/press/en/press.wml:26 msgid "Quick links to better understand Tor" msgstr "" #. type: Content of: <div><div><div><ol><li> -#: /home/runa/transifex/website/press/en/press.wml:28 +#: /home/runa/tor/website/press/en/press.wml:28 msgid "" "How is Tor <a href=\"<page docs/faq>#Torisdifferent\">different than other " "proxy solutions</a>?" msgstr "" #. type: Content of: <div><div><div><ol><li> -#: /home/runa/transifex/website/press/en/press.wml:29 +#: /home/runa/tor/website/press/en/press.wml:29 msgid "" -"<a href=\"../press/presskit/2009-General-Online-Anonymity-with-Tor.pdf\">Why " +"<a href=\"../press/presskit/General-Online-Anonymity-with-Tor.pdf\">Why " "Online Privacy and Anonymity</a>?" msgstr "" #. type: Content of: <div><div><div><ol><li> -#: /home/runa/transifex/website/press/en/press.wml:30 +#: /home/runa/tor/website/press/en/press.wml:30 msgid "" -"<a href=\"../press/presskit/2009-General-Background-on-Tor-Project-Inc.pdf" -"\">Who is the Tor Project, Inc.</a>?" +"<a href=\"../press/presskit/General-Background-on-Tor-Project-Inc.pdf\">Who " +"is the Tor Project, Inc.</a>?" msgstr "" #. type: Content of: <div><div><div><ol><li> -#: /home/runa/transifex/website/press/en/press.wml:31 +#: /home/runa/tor/website/press/en/press.wml:31 msgid "" "<a href=\"<blog>circumvention-and-anonymity\">Why anonymity matters for " "circumvention</a>." Modified: translation/trunk/projects/website/po/templates/projects/3-low.projects.pot =================================================================== --- translation/trunk/projects/website/po/templates/projects/3-low.projects.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/projects/3-low.projects.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-12 12:19+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -88,50 +88,55 @@ #. type: Content of: <div><div><table><tr><td><div> #: /home/runa/tor/website/projects/en/projects.wml:45 -msgid "<a href=\"<wiki>projects/TorBulkExitlist\">TorBEL</a>" +msgid "<a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a>" msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/projects/en/projects.wml:46 +#: /home/runa/tor/website/projects/en/projects.wml:47 msgid "" -"The Tor Bulk Exitlist is a service others can query to determine if an IP is " -"a tor exit node or not, and if so, on which TCP ports it allows traffic." +"In collaboration with <a href=\"https://guardianproject.info\">The Guardian " +"Project</a>, we're developing Tor on the Google Android mobile operating " +"system. A related application is <a href=\"https://guardianproject.info/apps/" +"orlib/\">Orlib</a>; a library for use by any Android application to route " +"Internet traffic through Orbot/Tor." msgstr "" #. type: Content of: <div><div><table><tr><td><div> -#: /home/runa/tor/website/projects/en/projects.wml:51 -msgid "<a href=\"<wiki>projects/TorCheck\">Tor Check</a>" +#: /home/runa/tor/website/projects/en/projects.wml:55 +msgid "<a href=\"https://amnesia.boum.org/\">TAILS</a>" msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/projects/en/projects.wml:52 +#: /home/runa/tor/website/projects/en/projects.wml:56 msgid "" -"The Tor Check website determines if you are successfully browsing with Tor." +"The (Amnesic) Incognito Live System is a live CD/USB distribution " +"preconfigured so that everything is safely routed through Tor and leaves no " +"trace on the local system." msgstr "" #. type: Content of: <div><div><table><tr><td><div> -#: /home/runa/tor/website/projects/en/projects.wml:58 -msgid "<a href=\"<page projects/gettor>\">GetTor</a>" +#: /home/runa/tor/website/projects/en/projects.wml:63 +msgid "<a href=\"http://torstatus.blutmagie.de/\">TorStatus</a>" msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/projects/en/projects.wml:59 +#: /home/runa/tor/website/projects/en/projects.wml:64 msgid "" -"GetTor is a program for serving Tor and related files over SMTP. Users " -"interact with GetTor by sending it email." +"Portal providing an overview of the Tor network, including a list of its " +"current relays and details on each. Mirrors are also available from <a href=" +"\"https://torstat.xenobite.eu/\">Xenobite</a>, <a href=\"http://torstatus." +"cyberphunk.org/\">cyberphunk</a>, and others." msgstr "" #. type: Content of: <div><div><table><tr><td><div> -#: /home/runa/tor/website/projects/en/projects.wml:63 -msgid "<a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a>" +#: /home/runa/tor/website/projects/en/projects.wml:70 +msgid "<a href=\"https://metrics.torproject.org/\">Metrics Portal</a>" msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/projects/en/projects.wml:65 +#: /home/runa/tor/website/projects/en/projects.wml:71 msgid "" -"In collaboration with <a href=\"https://guardianproject.info\">The Guardian " -"Project</a>, we're developing Tor on the Google Android mobile operating " -"system. A related application is <a href=\"https://guardianproject.info/apps/" -"orlib/\">Orlib</a>; a library for use by any Android application to route " -"Internet traffic through Orbot/Tor." +"Analytics for the Tor network, including graphs of its available bandwidth " +"and estimated userbase. This is a great resource for researchers interested " +"in detailed statistics about Tor." msgstr "" Modified: translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot =================================================================== --- translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot 2011-03-01 14:36:34 UTC (rev 24284) +++ translation/trunk/projects/website/po/templates/projects/4-optional.vidalia.pot 2011-03-01 17:06:10 UTC (rev 24285) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-12-26 14:32+0000\n" +"POT-Creation-Date: 2011-03-01 16:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" #. type: Content of: <div><div> -#: /home/runa/transifex/website/projects/en/vidalia.wml:8 +#: /home/runa/tor/website/projects/en/vidalia.wml:8 msgid "" "<a href=\"<page index>\">Home » </a> <a href=\"<page projects/projects>" "\">Projects » </a> <a href=\"<page projects/vidalia>\">Vidalia » " @@ -25,19 +25,19 @@ msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/transifex/website/projects/en/vidalia.wml:15 +#: /home/runa/tor/website/projects/en/vidalia.wml:15 msgid "Vidalia" msgstr "" #. type: Content of: <div><div><div> -#: /home/runa/transifex/website/projects/en/vidalia.wml:20 +#: /home/runa/tor/website/projects/en/vidalia.wml:20 msgid "" "<img src=\"$(IMGROOT)/Screenshot-Vidalia-Control-Panel.png\" width=\"261\" " -"height=\"255\" alt=\"Vidalia Control Panel Screenshot\">" +"height=\"255\" alt=\"Vidalia Control Panel Screenshot\"/>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/projects/en/vidalia.wml:25 +#: /home/runa/tor/website/projects/en/vidalia.wml:26 msgid "" "Vidalia is a cross-platform graphical controller for the <a href=\"<page " "index>\">Tor</a> software, built using the <a href=\"http://qt.nokia.com/" @@ -47,7 +47,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/projects/en/vidalia.wml:28 +#: /home/runa/tor/website/projects/en/vidalia.wml:34 msgid "" "Vidalia lets you start and stop Tor, see how much bandwidth you are " "consuming, see how many circuits you currently have active, see where these " @@ -55,21 +55,23 @@ "progress and current state, and let you configure your Tor client, bridge, " "or relay with a simple interface. Included in Vidalia is an extensive help " "system which helps you understand all of the options available to you. All " -"of these features are translated into a large number of languages." +"of these features are translated into a large number of languages. Vidalia " +"does not work alone, it requires Tor to be useful. (Tor is not included in " +"the downloads on this page.)" msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/projects/en/vidalia.wml:39 +#: /home/runa/tor/website/projects/en/vidalia.wml:46 msgid "<a id=\"Downloads\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/transifex/website/projects/en/vidalia.wml:40 +#: /home/runa/tor/website/projects/en/vidalia.wml:47 msgid "<a class=\"anchor\" href=\"#Downloads\">Downloads</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/projects/en/vidalia.wml:43 +#: /home/runa/tor/website/projects/en/vidalia.wml:50 msgid "" "Most Windows and Mac OS X users should simply download Vidalia as part of a " "<a href=\"<page download/download>\">Tor software bundle</a>. If you want to " @@ -78,62 +80,115 @@ msgstr "" #. type: Content of: <div><div><h4> -#: /home/runa/transifex/website/projects/en/vidalia.wml:50 +#: /home/runa/tor/website/projects/en/vidalia.wml:57 msgid "Stable Releases" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/projects/en/vidalia.wml:51 +#: /home/runa/tor/website/projects/en/vidalia.wml:58 msgid "The most recent stable release is: 0.2.10" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/transifex/website/projects/en/vidalia.wml:54 +#: /home/runa/tor/website/projects/en/vidalia.wml:61 msgid "" "<a href=\"../dist/vidalia/vidalia-0.2.10.msi\">Windows Installer</a> (<a " "href=\"../dist/vidalia/vidalia-0.2.10.msi.asc\">sig</a>)" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/transifex/website/projects/en/vidalia.wml:58 +#: /home/runa/tor/website/projects/en/vidalia.wml:65 msgid "" "<a href=\"../dist/vidalia/vidalia-0.2.10-i386.dmg\">Mac OS X x86 Only</a> " "(<a href=\"../dist/vidalia/vidalia-0.2.10-i386.dmg.asc\">sig</a>)" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/transifex/website/projects/en/vidalia.wml:62 +#: /home/runa/tor/website/projects/en/vidalia.wml:69 msgid "" "<a href=\"../dist/vidalia/vidalia-0.2.9-ppc.dmg\">Mac OS X PPC-only</a> (<a " "href=\"../dist/vidalia/vidalia-0.2.9-ppc.dmg.asc\">sig</a>)" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/transifex/website/projects/en/vidalia.wml:66 +#: /home/runa/tor/website/projects/en/vidalia.wml:73 msgid "" "<a href=\"<page docs/debian-vidalia>\">Instructions for Debian/Ubuntu/" "Knoppix Repositories</a>" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/transifex/website/projects/en/vidalia.wml:69 +#: /home/runa/tor/website/projects/en/vidalia.wml:76 msgid "" "<a href=\"../dist/vidalia/vidalia-0.2.10.tar.gz\">Source Tarball</a> (<a " "href=\"../dist/vidalia/vidalia-0.2.10.tar.gz.asc\">sig</a>)" msgstr "" #. type: Content of: <div><div> -#: /home/runa/transifex/website/projects/en/vidalia.wml:75 +#: /home/runa/tor/website/projects/en/vidalia.wml:82 +msgid "<a id=\"Contribute\"></a>" +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/projects/en/vidalia.wml:83 +msgid "<a class=\"anchor\" href=\"#Contribute\">Contribute</a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/projects/en/vidalia.wml:86 +msgid "" +"Vidalia is always looking for volunteers that want to help in development. " +"To start you should first take a look at the <a href=\"https://www." +"torproject.org/getinvolved/volunteer.html.en\"> volunteer page</a> and see " +"if there is something that interests you the most. Vidalia's source code " +"can be found in the SVN repository. The checkout URL is: https://svn." +"torproject.org/vidalia. You should get to know how Vidalia works internally " +"in order to work with it. To do this you should know C++ and Qt." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/projects/en/vidalia.wml:98 +msgid "" +"If you intend to start coding already, please read and follow the <a href=" +"\"https://svn.torproject.org/vidalia/vidalia/trunk/HACKING\">HACKING guide</" +"a>. If you have a patch for a feature or a bug fix, first check the <a href=" +"\"https://trac.torproject.org/projects/tor/report/27\">tickets that are " +"already submitted</a>, if there isn't a suited one for your patch, you can " +"submit a <a href=\"https://trac.torproject.org/projects/tor/newticket\">new " +"ticket</a> selecting Vidalia as its Component." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/projects/en/vidalia.wml:109 +msgid "" +"Every project member inside Tor mostly uses IRC to communicate. Vidalia is " +"being developed currently by Matt Edman and Tomas Touceda. You can find them " +"in #vidalia channel at OFTC under the nicks edmanm and chiiph, repectively. " +"You should get in touch in order to see what's everyone working on and to " +"share what you've been working on or what you want to do. If you intend to " +"join the team, it's expected you stay around IRC, either in Vidalia's " +"channel, or #tor-dev." +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/projects/en/vidalia.wml:119 +msgid "" +"If you have any doubts about any of the points in here, you can email <a " +"href=\"<page about/contact>\">contact us</a> about it." +msgstr "" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/projects/en/vidalia.wml:124 msgid "<a id=\"Support\"></a>" msgstr "" #. type: Content of: <div><div><h3> -#: /home/runa/transifex/website/projects/en/vidalia.wml:76 +#: /home/runa/tor/website/projects/en/vidalia.wml:125 msgid "<a class=\"anchor\" href=\"#Support\">Support & Development</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/projects/en/vidalia.wml:79 +#: /home/runa/tor/website/projects/en/vidalia.wml:128 msgid "" "Please open a <a href=\"https://trac.torproject.org/projects/tor/" "report/27\">ticket</a> on our bug tracker for any bugs you find or features " @@ -141,7 +196,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/transifex/website/projects/en/vidalia.wml:85 +#: /home/runa/tor/website/projects/en/vidalia.wml:134 msgid "" "We also have a <a href=\"http://lists.vidalia-project.net/cgi-bin/mailman/" "listinfo/vidalia-users\">vidalia-users</a> mailing list for support-related "

1 0

Jump to page: