October 2011 - tor-commits - lists.torproject.org

[tor/master] Fix memory leak in prop176 code
by nickm＠torproject.org 23 Oct '11

23 Oct '11

commit 80cf342e476f21b607f2088a6565bee93b1e08b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 23 12:30:16 2011 -0400 Fix memory leak in prop176 code This fixes part of bug4252. Bug not in any released version. --- src/common/tortls.c | 4 ++-- src/or/command.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 9a3c02b..e540bfd 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -864,8 +864,8 @@ tor_tls_get_my_client_auth_key(void) } /** - * Return the public key that a cetificate certifies. Return NULL if the - * cert's key is not RSA. + * Return a newly allocated copy of the public key that a certificate + * certifies. Return NULL if the cert's key is not RSA. */ crypto_pk_env_t * tor_tls_cert_get_key(tor_cert_t *cert) diff --git a/src/or/command.c b/src/or/command.c index 1b8ddb3..49c9880 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -1190,6 +1190,7 @@ command_process_authenticate_cell(var_cell_t *cell, or_connection_t *conn) signed_len = crypto_pk_public_checksig(pk, signed_data, keysize, (char*)auth + V3_AUTH_BODY_LEN, authlen - V3_AUTH_BODY_LEN); + crypto_free_pk_env(pk); if (signed_len < 0) { tor_free(signed_data); ERR("Signature wasn't valid");

1 0

[tor/master] Fix a reference-leak in tor_tls_received_v3_certificate
by nickm＠torproject.org 23 Oct '11

23 Oct '11

commit 87a93917c3f6aed650c7db2d6670b15f894cff56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 23 12:44:57 2011 -0400 Fix a reference-leak in tor_tls_received_v3_certificate We were calling SSL_get_peer_certificate but not X509_free. This is a major part of bug4252; the bug has been in no released version. --- src/common/tortls.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index e540bfd..a8b6085 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2229,33 +2229,43 @@ int tor_tls_received_v3_certificate(tor_tls_t *tls) { X509 *cert = SSL_get_peer_certificate(tls->ssl); - EVP_PKEY *key; + EVP_PKEY *key = NULL; X509_NAME *issuer_name, *subject_name; + int is_v3 = 0; if (!cert) { log_warn(LD_BUG, "Called on a connection with no peer certificate"); - return 0; + goto done; } subject_name = X509_get_subject_name(cert); issuer_name = X509_get_issuer_name(cert); - if (X509_name_cmp(subject_name, issuer_name) == 0) - return 1; /* purportedly self signed */ + if (X509_name_cmp(subject_name, issuer_name) == 0) { + is_v3 = 1; /* purportedly self signed */ + goto done; + } if (dn_indicates_v3_cert(subject_name) || - dn_indicates_v3_cert(issuer_name)) - return 1; /* DN is fancy */ + dn_indicates_v3_cert(issuer_name)) { + is_v3 = 1; /* DN is fancy */ + goto done; + } key = X509_get_pubkey(cert); if (EVP_PKEY_bits(key) != 1024 || EVP_PKEY_type(key->type) != EVP_PKEY_RSA) { - EVP_PKEY_free(key); - return 1; /* Key is fancy */ + is_v3 = 1; /* Key is fancy */ + goto done; } - EVP_PKEY_free(key); - return 0; + done: + if (key) + EVP_PKEY_free(key); + if (cert) + X509_free(cert); + + return is_v3; } /** Return the number of server handshakes that we've noticed doing on

1 0

[tor/master] Check for intro circ timeouts properly
by nickm＠torproject.org 23 Oct '11

23 Oct '11

commit b095be7f69e4b010d990d08c14eea74729f9528c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Oct 12 06:41:33 2011 -0700 Check for intro circ timeouts properly Previously, we would treat an intro circuit failure as a timeout iff the circuit failed due to a mismatch in relay identity keys. (Due to a bug elsewhere, we only recognize relay identity-key mismatches on the first hop, so this isn't as bad as it could have been.) Bugfix on commit eaed37d14c6e1dc93a392f62ef2e501f75e4878a, not yet in any release. --- src/or/circuitlist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index b25a71e..ef884f3 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1192,7 +1192,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, } if (circ->purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); - int timed_out = (reason == END_STREAM_REASON_TIMEOUT); + int timed_out = (reason == END_CIRC_REASON_TIMEOUT); tor_assert(circ->state == CIRCUIT_STATE_OPEN); tor_assert(ocirc->build_state->chosen_exit); tor_assert(ocirc->rend_data); @@ -1207,7 +1207,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, INTRO_POINT_FAILURE_TIMEOUT : INTRO_POINT_FAILURE_GENERIC); } else if (circ->purpose == CIRCUIT_PURPOSE_C_INTRODUCING && - reason != END_STREAM_REASON_TIMEOUT) { + reason != END_CIRC_REASON_TIMEOUT) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); tor_assert(ocirc->build_state->chosen_exit); tor_assert(ocirc->rend_data);

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug3825c'
by nickm＠torproject.org 23 Oct '11

23 Oct '11

commit 0c2a3601e8283f3a63f624cfe2c54d21cae62fa3 Merge: cc3f0ba b095be7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 23 12:55:10 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3825c' src/or/circuitlist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Oct '11

23 Oct '11

commit d61ade76ca21a29ba416400bcec7718462033480 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 23 14:15:24 2011 +0000 Update translations for gettor --- el/gettor.po | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/el/gettor.po b/el/gettor.po index 10e8f91..7a72a2b 100644 --- a/el/gettor.po +++ b/el/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-23 13:44+0000\n" +"PO-Revision-Date: 2011-10-23 13:48+0000\n" "Last-Translator: anestv <varsamidis7-etc(a)yahoo.gr>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -162,18 +162,21 @@ msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." msgstr "" -"Αποστολή αυτό το κείμενο σε ένα email στο GetTor θα το αναγκάσει να σας " -"στείλει το Tor Bundle Browser σε έναν αριθμό 1,4 MB συνημμένα." +"Αν στείλετε αυτό το κείμενο σε ένα email στο GetTor θα το αναγκάσει να σας " +"στείλει το Tor Browser Bundle σε πολλά μηνύματα με 1,4 MB συνημμένα." #: lib/gettor/i18n.py:105 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" msgstr "" +"Μετά την παραλαβή όλων των μερών, θα πρέπει να τα ξανά-συναρμολογήσετε το " +"πακέτο και πάλι. Αυτό γίνεται ως εξής:" #: lib/gettor/i18n.py:108 msgid "1.) Save all received attachments into one folder on your disk." msgstr "" +"1.) Αποθηκεύστε όλα τα ληφθέντα συνημμένα σε ένα φάκελο στο δίσκο σας." #: lib/gettor/i18n.py:110 msgid "" @@ -377,6 +380,8 @@ msgid "" "linux-i386:\n" "The Tor Browser Bundle package for Linux, 32bit versions." msgstr "" +"linux-i386: \n" +"Το πακέτο Tor Browser Bundle για το Linux, 32bit εκδόση." #: lib/gettor/i18n.py:229 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Oct '11

23 Oct '11

commit 34d0d1a697d061638deb157fda6ab2d852f8524b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 23 13:45:22 2011 +0000 Update translations for gettor --- el/gettor.po | 461 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 461 insertions(+), 0 deletions(-) diff --git a/el/gettor.po b/el/gettor.po new file mode 100644 index 0000000..10e8f91 --- /dev/null +++ b/el/gettor.po @@ -0,0 +1,461 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# <varsamidis7-etc(a)yahoo.gr>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-09-10 01:52-0400\n" +"PO-Revision-Date: 2011-10-23 13:44+0000\n" +"Last-Translator: anestv <varsamidis7-etc(a)yahoo.gr>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: el\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" +"(Σας ζητούμε συγγνώμη εάν δεν ζήτησε για αυτό το mail. Από το email σας από " +"μια υπηρεσία που δεν χρησιμοποιεί DKIM, θα στείλουμε μία σύντομη εξήγηση, " +"και στη συνέχεια θα αγνοήσουμε αυτό το e-mail για την επόμενη ημέρα ή έτσι.)" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: community-support(a)lists.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:56 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:71 +msgid " List of supported locales:" +msgstr "Κατάλογος υποστηριζόμενων γλωσσών:" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "Εδώ είναι μια λίστα με όλες τις διαθέσιμες γλώσσες:" + +#: lib/gettor/i18n.py:75 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" +"gettor+ar(a)torproject.org: Αραβικά\n" +"gettor+de(a)torproject.org: Γερμανικά \n" +"gettor+en(a)torproject.org: Αγγλικά \n" +"gettor+es(a)torproject.org: Ισπανικά \n" +"gettor+fa(a)torproject.org: Περσικά (Ιράν) \n" +"gettor+fr(a)torproject.org: Γαλλικά \n" +"gettor+it(a)torproject.org: Ιταλικά \n" +"gettor+nl(a)torproject.org: Ολλανδικά \n" +"gettor+pl(a)torproject.org: Πολωνικά \n" +"gettor+ru(a)torproject.org: Ρώσικα\n" +"gettor+zh(a)torproject.org : Κινέζικα" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "Εάν δεν επιλέξετε γλώσσα, θα λάβετε την αγγλική έκδοση." + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:96 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:102 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" +"Αποστολή αυτό το κείμενο σε ένα email στο GetTor θα το αναγκάσει να σας " +"στείλει το Tor Bundle Browser σε έναν αριθμό 1,4 MB συνημμένα." + +#: lib/gettor/i18n.py:105 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" + +#: lib/gettor/i18n.py:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:110 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:117 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:121 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "" + +#: lib/gettor/i18n.py:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:155 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:162 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:170 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:176 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:179 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:182 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:188 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:196 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:210 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:213 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:218 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:245 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "" + +

1 0

[flashproxy/master] Remove the claim that you must install swfcat.swf on your own server.
by dcf＠torproject.org 23 Oct '11

23 Oct '11

commit 4e1bbb37eff51525bda0bf205a899f2c12836077 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 23 00:11:00 2011 -0700 Remove the claim that you must install swfcat.swf on your own server. --- README | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/README b/README index fc2c4df..34d1e1d 100644 --- a/README +++ b/README @@ -150,8 +150,7 @@ wait a few minutes. It can take a while to download relay descriptors. == How to put a flash proxy badge on a web page. -Copy swfcat.swf to your server, then paste in this HTML where you want -the badge to appear: +Paste in this HTML where you want the badge to appear: <script type="text/javascript" src="https://crypto.stanford.edu/flashproxy/flashproxy.js"></script>

1 0

[flashproxy/master] Use an iframe for badge embedding.
by dcf＠torproject.org 23 Oct '11

23 Oct '11

commit 36d0773ee9197c992819d1fbbb1b63e95e298921 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 23 00:08:33 2011 -0700 Use an iframe for badge embedding. Dan told me: "Sites will likely want to iframe the script so as not to give it control of the enclosing page." This makes sense. So provide a public embed.html, and add a sample iframe HTML snippet to easily include it. --- README | 4 +- embed.html | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ flashproxy.js | 141 -------------------------------------------------- 3 files changed, 162 insertions(+), 144 deletions(-) diff --git a/README b/README index 34d1e1d..82e881c 100644 --- a/README +++ b/README @@ -152,9 +152,7 @@ wait a few minutes. It can take a while to download relay descriptors. Paste in this HTML where you want the badge to appear: -<script type="text/javascript" src="https://crypto.stanford.edu/flashproxy/flashproxy.js"></script> - -It will be inserted as a span element with the id "flashproxy-badge". +<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="70px" height="23px" frameBorder="0" scrolling="0"></iframe> == For developers diff --git a/embed.html b/embed.html new file mode 100644 index 0000000..fc1fe6d --- /dev/null +++ b/embed.html @@ -0,0 +1,161 @@ +<!DOCTYPE html> +<html> +<head> +<script type="text/javascript"> +/* Are circumstances such that we should self-disable and not be a + proxy? We take a best-effort guess as to whether this device runs on + a battery or the data transfer might be expensive. + + Matching mobile User-Agents is complex; but we only need to match + those devices that can also run a recent version of Adobe Flash, + which is a subset of this list: + https://secure.wikimedia.org/wikipedia/en/wiki/Adobe_Flash_Player#Mobile_op… + + Other resources: + http://www.zytrax.com/tech/web/mobile_ids.html + http://googlewebmastercentral.blogspot.com/2011/03/mo-better-to-also-detect… + http://search.cpan.org/~cmanley/Mobile-UserAgent-1.05/lib/Mobile/UserAgent.… +*/ +function flashproxy_should_disable() +{ + var ua; + + ua = window.navigator.userAgent; + if (ua != null) { + const UA_LIST = [ + /\bmobile\b/i, + /\bandroid\b/i, + /\bopera mobi\b/i, + ]; + + for (var i = 0; i < UA_LIST.length; i++) { + var re = UA_LIST[i]; + + if (ua.match(re)) { + return true; + } + } + } + + return false; +} + +/* Create and return a DOM fragment: +<span id=BADGE_ID> +<a href=FLASHPROXY_INFO_URL> + child +</a> +</span> +*/ +function flashproxy_make_container(child) +{ + const BADGE_ID = "flashproxy-badge"; + const FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; + + var container; + var a; + + container = document.createElement("span"); + container.setAttribute("id", "flashproxy-badge"); + a = document.createElement("a"); + a.setAttribute("href", FLASHPROXY_INFO_URL); + a.appendChild(child) + container.appendChild(a); + + return container; +} + +/* Create and return a DOM fragment: +<object width=WIDTH height=HEIGHT> + <param name="movie" value=SWFCAT_URL> + <param name="flashvars" value=FLASHVARS> + <embed src=SWFCAT_URL width=WIDTH height=HEIGHT flashvars=FLASHVARS></embed> +</object> +*/ +function flashproxy_make_badge() +{ + const WIDTH = 70; + const HEIGHT = 23; + const FLASHVARS = ""; + const SWFCAT_URL = "https://crypto.stanford.edu/flashproxy/swfcat.swf"; + + var object; + var param; + var embed; + + object = document.createElement("object"); + object.setAttribute("width", WIDTH); + object.setAttribute("height", HEIGHT); + + param = document.createElement("param"); + param.setAttribute("name", "movie"); + param.setAttribute("value", SWFCAT_URL); + object.appendChild(param); + param = document.createElement("param"); + param.setAttribute("name", "flashvars"); + param.setAttribute("value", FLASHVARS); + object.appendChild(param); + + embed = document.createElement("embed"); + embed.setAttribute("src", SWFCAT_URL); + embed.setAttribute("width", WIDTH); + embed.setAttribute("height", HEIGHT); + embed.setAttribute("flashvars", FLASHVARS); + object.appendChild(embed); + + return object; +} + +/* Create and return a non-functional placeholder badge DOM fragment: +<img src=BADGE_IMAGE_URL border="0"> +*/ +function flashproxy_make_dummy_badge() +{ + const BADGE_IMAGE_URL = "https://crypto.stanford.edu/flashproxy/badge.png"; + + var img; + + img = document.createElement("img"); + img.setAttribute("src", BADGE_IMAGE_URL); + img.setAttribute("border", 0); + + return img; +} + +function flashproxy_badge_insert() +{ + var badge; + var e; + + if (flashproxy_should_disable()) { + badge = flashproxy_make_dummy_badge(); + } else { + badge = flashproxy_make_badge(); + } + + /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to + insert right after the <script> element in the DOM. */ + e = document; + while (e.lastChild && e.lastChild.nodeType == 1) { + e = e.lastChild; + } + e.parentNode.appendChild(flashproxy_make_container(badge)); +} +</script> + +<style type="text/css"> +body { + margin: 0; + padding: 0; +} +</style> +</head> +<body> +<script type="text/javascript"> +flashproxy_badge_insert(); +</script> +<noscript> +<a href="https://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" border="0" alt="I support Internet freedom"></a> +</noscript> +</body> +</html> diff --git a/flashproxy.js b/flashproxy.js deleted file mode 100644 index a16edb3..0000000 --- a/flashproxy.js +++ /dev/null @@ -1,141 +0,0 @@ -/* Are circumstances such that we should self-disable and not be a - proxy? We take a best-effort guess as to whether this device runs on - a battery or the data transfer might be expensive. - - Matching mobile User-Agents is complex; but we only need to match - those devices that can also run a recent version of Adobe Flash, - which is a subset of this list: - https://secure.wikimedia.org/wikipedia/en/wiki/Adobe_Flash_Player#Mobile_op… - - Other resources: - http://www.zytrax.com/tech/web/mobile_ids.html - http://googlewebmastercentral.blogspot.com/2011/03/mo-better-to-also-detect… - http://search.cpan.org/~cmanley/Mobile-UserAgent-1.05/lib/Mobile/UserAgent.… -*/ -function flashproxy_should_disable() -{ - var ua; - - ua = window.navigator.userAgent; - if (ua != null) { - const UA_LIST = [ - /\bmobile\b/i, - /\bandroid\b/i, - /\bopera mobi\b/i, - ]; - - for (var i = 0; i < UA_LIST.length; i++) { - var re = UA_LIST[i]; - - if (ua.match(re)) { - return true; - } - } - } - - return false; -} - -/* Create and return a DOM fragment: -<span id=BADGE_ID> -<a href=FLASHPROXY_INFO_URL> - child -</a> -</span> -*/ -function flashproxy_make_container(child) -{ - const BADGE_ID = "flashproxy-badge"; - const FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; - - var container; - var a; - - container = document.createElement("span"); - container.setAttribute("id", "flashproxy-badge"); - a = document.createElement("a"); - a.setAttribute("href", FLASHPROXY_INFO_URL); - a.appendChild(child) - container.appendChild(a); - - return container; -} - -/* Create and return a DOM fragment: -<object width=WIDTH height=HEIGHT> - <param name="movie" value=SWFCAT_URL> - <param name="flashvars" value=FLASHVARS> - <embed src=SWFCAT_URL width=WIDTH height=HEIGHT flashvars=FLASHVARS></embed> -</object> -*/ -function flashproxy_make_badge() -{ - const WIDTH = 70; - const HEIGHT = 23; - const FLASHVARS = ""; - const SWFCAT_URL = "https://crypto.stanford.edu/flashproxy/swfcat.swf"; - - var object; - var param; - var embed; - - object = document.createElement("object"); - object.setAttribute("width", WIDTH); - object.setAttribute("height", HEIGHT); - - param = document.createElement("param"); - param.setAttribute("name", "movie"); - param.setAttribute("value", SWFCAT_URL); - object.appendChild(param); - param = document.createElement("param"); - param.setAttribute("name", "flashvars"); - param.setAttribute("value", FLASHVARS); - object.appendChild(param); - - embed = document.createElement("embed"); - embed.setAttribute("src", SWFCAT_URL); - embed.setAttribute("width", WIDTH); - embed.setAttribute("height", HEIGHT); - embed.setAttribute("flashvars", FLASHVARS); - object.appendChild(embed); - - return object; -} - -/* Create and return a non-functional placeholder badge DOM fragment: -<img src=BADGE_IMAGE_URL border="0"> -*/ -function flashproxy_make_dummy_badge() -{ - const BADGE_IMAGE_URL = "https://crypto.stanford.edu/flashproxy/badge.png"; - - var img; - - img = document.createElement("img"); - img.setAttribute("src", BADGE_IMAGE_URL); - img.setAttribute("border", 0); - - return img; -} - -function flashproxy_badge_insert() -{ - var badge; - var e; - - if (flashproxy_should_disable()) { - badge = flashproxy_make_dummy_badge(); - } else { - badge = flashproxy_make_badge(); - } - - /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to - insert right after the <script> element in the DOM. */ - e = document; - while (e.lastChild && e.lastChild.nodeType == 1) { - e = e.lastChild; - } - e.parentNode.appendChild(flashproxy_make_container(badge)); -} - -flashproxy_badge_insert();

1 0

r25181: {website} update the list of mirrors with correct urls, update the sta (in website/trunk: . include)
by Andrew Lewman 22 Oct '11

22 Oct '11

Author: phobos Date: 2011-10-22 20:58:30 +0000 (Sat, 22 Oct 2011) New Revision: 25181 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update the list of mirrors with correct urls, update the status of mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-10-22 17:58:04 UTC (rev 25180) +++ website/trunk/include/mirrors-table.wmi 2011-10-22 20:58:30 UTC (rev 25181) @@ -1,42 +1,8 @@ <tr> - <td>TN</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.mirror.tn/dist/">http</a></td> - <td><a href="http://tor.mirror.tn/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>NL</td> - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>NL</td> - <td></td> <td>Up to date</td> @@ -103,23 +69,6 @@ <tr> - <td>IS</td> - - <td>torproject.is</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist">http</a></td> - <td><a href="http://torproject.is/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td>BarkerJr</td> @@ -144,9 +93,9 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> @@ -178,10 +127,10 @@ <td>Up to date</td> <td><a href="ftp://key-server.org/tor">ftp</a></td> - <td><a href="http://tor.key-server.org/dist">http</a></td> - <td><a href="http://tor.key-server.org">http</a></td> - <td><a href="https://tor.key-server.org/dist">https</a></td> - <td><a href="https://tor.key-server.org">https</a></td> + <td><a href="http://tor.key-server.org/dist/">http</a></td> + <td><a href="http://tor.key-server.org/">http</a></td> + <td><a href="https://tor.key-server.org/dist/">https</a></td> + <td><a href="https://tor.key-server.org/">https</a></td> <td> - </td> <td> - </td> </tr> @@ -229,8 +178,8 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist">http</a></td> - <td><a href="http://tor.cyberarmy.at">http</a></td> + <td><a href="http://tor.cyberarmy.at/dist/">http</a></td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -246,8 +195,8 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist">http</a></td> - <td><a href="http://tor.searchprivate.com">http</a></td> + <td><a href="http://tor.searchprivate.com/dist/">http</a></td> + <td><a href="http://tor.searchprivate.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -275,23 +224,6 @@ <td>DE</td> - <td>factor.cc</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - <td>chaos darmstadt</td> <td>Up to date</td> @@ -314,7 +246,7 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.tor.hu/dist">http</a></td> + <td><a href="http://mirror.tor.hu/dist/">http</a></td> <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> @@ -348,8 +280,8 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist">http</a></td> - <td><a href="http://torproject.nwlinux.us">http</a></td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,6 +290,91 @@ <tr> + <td>IS</td> + + <td>TheOnionRouter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.theonionrouter.com/dist/">http</a></td> + <td><a href="http://www.theonionrouter.com/">http</a></td> + <td><a href="https://www.theonionrouter.com/dist/">https</a></td> + <td><a href="https://www.theonionrouter.com/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>TN</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.mirror.tn/dist/">http</a></td> + <td><a href="http://tor.mirror.tn/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>IS</td> + + <td>torproject.is</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + + <td>factor.cc</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IL</td> <td>Host4site</td> @@ -365,7 +382,7 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.host4site.co.il/torproject.org/dist">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> <td> - </td> @@ -399,7 +416,7 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist">http</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> @@ -416,7 +433,7 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> @@ -443,23 +460,6 @@ <tr> - <td>INT</td> - - <td>CoralCDN</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td></td> @@ -467,8 +467,8 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://tor.freie-re.de/dist">http</a></td> - <td><a href="http://tor.freie-re.de">http</a></td> + <td><a href="http://tor.freie-re.de/dist/">http</a></td> + <td><a href="http://tor.freie-re.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -484,8 +484,8 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist">http</a></td> - <td><a href="http://tor.vesta.nu">http</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -554,7 +554,7 @@ <td> - </td> <td> - </td> <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist">https</a></td> + <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -562,19 +562,19 @@ <tr> - <td>IS</td> + <td>INT</td> - <td>TheOnionRouter</td> + <td>CoralCDN</td> <td>Unknown</td> <td> - </td> - <td><a href="http://www.theonionrouter.com/dist/">http</a></td> - <td><a href="http://www.theonionrouter.com/">http</a></td> - <td><a href="https://www.theonionrouter.com/dist/">https</a></td> - <td><a href="https://www.theonionrouter.com/">https</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -586,10 +586,10 @@ <td>Unknown</td> <td> - </td> - <td><a href="https://torproject.crypto.is/dist">http</a></td> - <td><a href="https://torproject.crypto.is">http</a></td> - <td><a href="https://torproject.crypto.is/dist">https</a></td> - <td><a href="https://torproject.crypto.is">https</a></td> + <td><a href="https://torproject.crypto.is/dist/">http</a></td> + <td><a href="https://torproject.crypto.is/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">https</a></td> + <td><a href="https://torproject.crypto.is/">https</a></td> <td> - </td> <td> - </td> </tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-10-22 17:58:04 UTC (rev 25180) +++ website/trunk/update-mirrors.pl 2011-10-22 20:58:30 UTC (rev 25181) @@ -40,7 +40,7 @@ sub FetchDate { my $url = shift; # Base url for mirror - my $trace = "/project/trace/www-master.torproject.org"; # Location of recent update info + my $trace = "project/trace/www-master.torproject.org"; # this file should always exist $url = "$url$trace"; print "Fetching possible date from: $url\n"; @@ -101,7 +101,6 @@ rsyncDistMirror => "", hiddenServiceMirror => "", updateDate => "Unknown", - }, mirror001 => { @@ -262,7 +261,7 @@ httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://mirror.tor.hu/dist", + httpDistMirror => "http://mirror.tor.hu/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", @@ -401,7 +400,7 @@ httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://tor.homosu.net/dist", + httpDistMirror => "http://tor.homosu.net/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", @@ -435,11 +434,11 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "No", - httpWebsiteMirror => "http://torproject.nwlinux.us", + httpWebsiteMirror => "http://torproject.nwlinux.us/", httpsWebsiteMirror => "", rsyncWebsiteMirror => "rsync://nwlinux.us/tor-web", ftpWebsiteMirror => "", - httpDistMirror => "http://torproject.nwlinux.us/dist", + httpDistMirror => "http://torproject.nwlinux.us/dist/", httpsDistMirror => "", rsyncDistMirror => "rsync://nwlinux.us/tor-dist", hiddenServiceMirror => "", @@ -457,7 +456,7 @@ httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://tor.taiga-san.net/dist", + httpDistMirror => "http://tor.taiga-san.net/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", @@ -471,11 +470,11 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "No", - httpWebsiteMirror => "http://tor.searchprivate.com", + httpWebsiteMirror => "http://tor.searchprivate.com/", httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://tor.searchprivate.com/dist", + httpDistMirror => "http://tor.searchprivate.com/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", @@ -489,11 +488,11 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "No", - httpWebsiteMirror => "http://tor.cyberarmy.at", + httpWebsiteMirror => "http://tor.cyberarmy.at/", httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://tor.cyberarmy.at/dist", + httpDistMirror => "http://tor.cyberarmy.at/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", @@ -511,7 +510,7 @@ httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://torproject.is/dist", + httpDistMirror => "http://torproject.is/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", @@ -529,8 +528,8 @@ httpsWebsiteMirror => "https://www.torservers.net/mirrors/torproject.org/", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://www.torservers.net/mirrors/torproject.org/dist", - httpsDistMirror => "https://www.torservers.net/mirrors/torproject.org/dist", + httpDistMirror => "http://www.torservers.net/mirrors/torproject.org/dist/", + httpsDistMirror => "https://www.torservers.net/mirrors/torproject.org/dist/", rsyncDistMirror => "", hiddenServiceMirror => "http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/", }, @@ -548,7 +547,7 @@ rsyncWebsiteMirror => "", ftpWebsiteMirror => "", httpDistMirror => "", - httpsDistMirror => "https://www.coevoet.nl/tor/dist", + httpsDistMirror => "https://www.coevoet.nl/tor/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", }, @@ -561,12 +560,12 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "No", - httpWebsiteMirror => "https://torproject.crypto.is", - httpsWebsiteMirror => "https://torproject.crypto.is", + httpWebsiteMirror => "https://torproject.crypto.is/", + httpsWebsiteMirror => "https://torproject.crypto.is/", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "https://torproject.crypto.is/dist", - httpsDistMirror => "https://torproject.crypto.is/dist", + httpDistMirror => "https://torproject.crypto.is/dist/", + httpsDistMirror => "https://torproject.crypto.is/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", }, @@ -579,11 +578,11 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "No", - httpWebsiteMirror => "http://tor.vesta.nu", + httpWebsiteMirror => "http://tor.vesta.nu/", httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://tor.vesta.nu/dist", + httpDistMirror => "http://tor.vesta.nu/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", @@ -597,12 +596,12 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "No", - httpWebsiteMirror => "http://tor.key-server.org", - httpsWebsiteMirror => "https://tor.key-server.org", + httpWebsiteMirror => "http://tor.key-server.org/", + httpsWebsiteMirror => "https://tor.key-server.org/", rsyncWebsiteMirror => "", ftpWebsiteMirror => "ftp://key-server.org/tor", - httpDistMirror => "http://tor.key-server.org/dist", - httpsDistMirror => "https://tor.key-server.org/dist", + httpDistMirror => "http://tor.key-server.org/dist/", + httpsDistMirror => "https://tor.key-server.org/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", }, @@ -615,11 +614,11 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "No", - httpWebsiteMirror => "http://tor.freie-re.de", + httpWebsiteMirror => "http://tor.freie-re.de/", httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://tor.freie-re.de/dist", + httpDistMirror => "http://tor.freie-re.de/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", @@ -637,7 +636,7 @@ httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://mirror.host4site.co.il/torproject.org/dist", + httpDistMirror => "http://mirror.host4site.co.il/torproject.org/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", @@ -670,7 +669,7 @@ ipv6 => "False", loadBalanced => "No", httpWebsiteMirror => "http://tor.factor.cc/", - httpsWebsiteMirror => "https://factor.cc/tor", + httpsWebsiteMirror => "https://factor.cc/tor/", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", httpDistMirror => "http://tor.factor.cc/dist/", @@ -739,7 +738,7 @@ print "Fetching the last updated date for each mirror.\n"; my $tortime; -$tortime = FetchDate("http://www.torproject.org/"); +$tortime = FetchDate("https://www.torproject.org/"); # Adjust offical Tor time by out-of-date offset: number of days * seconds per day $tortime -= 1 * 172800; print "The official time for Tor is $tortime. \n";

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 22 Oct '11

22 Oct '11

commit 99f0a62f7700bc2f8e63fcaf5af9c6b177580270 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 22 20:34:35 2011 +0000 Update translations for vidalia_help --- es/running.po | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/es/running.po b/es/running.po index 755a66e..5218cf4 100644 --- a/es/running.po +++ b/es/running.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-10-22 20:03+0000\n" +"PO-Revision-Date: 2011-10-22 20:11+0000\n" "Last-Translator: lenazun <lenazun(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -27,31 +27,35 @@ msgid "" "Tor, as well as monitoring Tor's status and letting you know if it exits " "unexpectedly." msgstr "" +"Vidalia puede ayudarle a controlar sus procesos al permitirle iniciar y " +"detener Tor, así como monitorizar el estado de Tor y dejándole saber si se " +"cierra de forma inesperada." #. type: Content of: <html><body> #: en/running.html:25 msgid "<a name=\"starting\"/>" -msgstr "" +msgstr "<a name=\"starting\"/>" #. type: Content of: <html><body><h3> #: en/running.html:26 msgid "Starting and Stopping Tor" -msgstr "" +msgstr "Iniciar y Detener Tor" #. type: Content of: <html><body><p> #: en/running.html:28 msgid "To <i>start</i> Tor," -msgstr "" +msgstr "Para <i>iniciar</i> Tor," #. type: Content of: <html><body><p><ol><li> #: en/running.html:30 msgid "Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i>" msgstr "" +"Seleccione <i>Iniciar</i> del menú de Vidalia o presione <i>Ctrl+S</i>" #. type: Content of: <html><body><p><ol> #: en/running.html:30 en/running.html:45 msgid "." -msgstr "" +msgstr "." #. type: Content of: <html><body><p><ol><li> #: en/running.html:32 @@ -59,6 +63,8 @@ msgid "" "Vidalia's tray icon will change from an onion with a red X to a green onion " "when Tor has started." msgstr "" +"El ícono de la bandeja de Vidalia cambiará de una cebolla con una X roja, a " +"una cebolla verde cuando Tor haya iniciado. " #. type: Content of: <html><body><p> #: en/running.html:36 @@ -68,16 +74,21 @@ msgid "" "href=\"log.html\">message log</a> to see if Tor printed any more information" " about what went wrong." msgstr "" +"Si Vidalia no puede iniciar Tor, Vidalia le mostrará un mensaje de error " +"diciéndole qué pudo haber salido mal. También puede leer el <a " +"href=\"log.html\">registro de mensajes</a> para ver si Tor generó más " +"información sobre el problema." #. type: Content of: <html><body><p> #: en/running.html:43 msgid "To <i>stop</i> Tor," -msgstr "" +msgstr "Para <i>detener</i> Tor," #. type: Content of: <html><body><p><ol><li> #: en/running.html:45 msgid "Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i>" msgstr "" +"Seleccione <i>Detener</i> en el menú de Vidalia o presione <i>Ctrl+T</i>" #. type: Content of: <html><body><p><ol><li> #: en/running.html:47 @@ -85,6 +96,8 @@ msgid "" "Vidalia's tray icon will change from a green onion to a gray onion with a " "red X when Tor has stopped." msgstr "" +"El ícono de la bandeja de Vidalia cambiará de una cebolla verde a una " +"cebolla gris con una X roja, cuando Tor se haya detenido." #. type: Content of: <html><body><p> #: en/running.html:51 @@ -94,11 +107,15 @@ msgid "" "href=\"log.html\">message log</a> to see if Tor printed any more information" " about what went wrong." msgstr "" +"Si Vidalia no puede detener Tor, Vidalia le mostrará un mensaje de error " +"diciéndole qué pudo haber salido mal. También puede leer el <a " +"href=\"log.html\">registro de mensajes</a> para ver si Tor generó más " +"información sobre el problema." #. type: Content of: <html><body> #: en/running.html:57 msgid "<a name=\"monitoring\"/>" -msgstr "" +msgstr "<a name=\"monitoring\"/>" #. type: Content of: <html><body><h3> #: en/running.html:58

1 0