- tor-commits - lists.torproject.org

[flashproxy/master] Revert "Set UseMicrodescriptors=0 in torrc."
by dcf＠torproject.org 15 Nov '11

15 Nov '11

commit b6f1b3a9213cba29448f28fc0ccbf3986bbd597b Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 15 14:42:49 2011 -0800 Revert "Set UseMicrodescriptors=0 in torrc." This reverts commit c1f7a98d7e8a1f8c0df89685d06ca53e790c01fe. A better solution to this was to upgrade the flash proxy bridge to 0.2.3. UseMicrodescriptors isn't present in 0.2.2 clients. The underlying problem is ticket #4013 in trac.torproject.org. --- torrc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/torrc b/torrc index 98769f4..0bab31c 100644 --- a/torrc +++ b/torrc @@ -5,7 +5,6 @@ UseBridges 1 Bridge 127.0.0.1:9001 -UseMicrodescriptors 0 Socks4Proxy 127.0.0.1:9001 # In case you are not able to receive remote connections on port 9000, comment

1 0

[tor/master] Merge branch 'bug4371_squashed'
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit c4a4ac7de6d32482fad36ce5af9b1e932cd506cb Merge: 26fcb4b 69dd993 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 15 15:58:00 2011 -0500 Merge branch 'bug4371_squashed' changes/bug4371 | 3 ++ src/common/tortls.c | 55 ++++++++++++++++++++++++++++---------------------- src/common/tortls.h | 7 ++++- src/or/command.c | 8 +++--- 4 files changed, 43 insertions(+), 30 deletions(-)

1 0

[tor/master] Allow up to a 30 days future skew, 48 hours past skew in certs.
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 87622e4c7e1a3b5c80e67141de7947d0304b6f31 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 22:21:45 2011 -0500 Allow up to a 30 days future skew, 48 hours past skew in certs. --- changes/bug4371 | 3 +++ src/common/tortls.c | 30 ++++++++++++++++-------------- src/common/tortls.h | 3 ++- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/changes/bug4371 b/changes/bug4371 new file mode 100644 index 0000000..37e6faa --- /dev/null +++ b/changes/bug4371 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Tolerate servers with more clock skew than previously. Fixes bug 4371; + bugfix on 0.2.3.6-alpha. diff --git a/src/common/tortls.c b/src/common/tortls.c index 8cf396c..ff0d329 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -212,7 +212,8 @@ static int tor_tls_context_init_one(tor_tls_context_t **ppcontext, static tor_tls_context_t *tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, int is_client); -static int check_cert_lifetime_internal(const X509 *cert, int tolerance); +static int check_cert_lifetime_internal(const X509 *cert, + int past_tolerance, int future_tolerance); /** Global TLS contexts. We keep them here because nobody else needs * to touch them. */ @@ -960,8 +961,7 @@ tor_tls_cert_is_valid(const tor_cert_t *cert, /* okay, the signature checked out right. Now let's check the check the * lifetime. */ - /*XXXX tolerance might be iffy here */ - if (check_cert_lifetime_internal(cert->cert, 60*60) < 0) + if (check_cert_lifetime_internal(cert->cert, 48*60*60, 30*24*60*60) < 0) return 0; cert_key = X509_get_pubkey(cert->cert); @@ -2062,14 +2062,14 @@ tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_env_t **identity_key) return r; } -/** Check whether the certificate set on the connection tls is - * expired or not-yet-valid, give or take tolerance - * seconds. Return 0 for valid, -1 for failure. +/** Check whether the certificate set on the connection tls is expired + * give or take past_tolerance seconds, or not-yet-valid give or take + * future_tolerance seconds. Return 0 for valid, -1 for failure. * * NOTE: you should call tor_tls_verify before tor_tls_check_lifetime. */ int -tor_tls_check_lifetime(tor_tls_t *tls, int tolerance) +tor_tls_check_lifetime(tor_tls_t *tls, int past_tolerance, int future_tolerance) { X509 *cert; int r = -1; @@ -2077,7 +2077,7 @@ tor_tls_check_lifetime(tor_tls_t *tls, int tolerance) if (!(cert = SSL_get_peer_certificate(tls->ssl))) goto done; - if (check_cert_lifetime_internal(cert, tolerance) < 0) + if (check_cert_lifetime_internal(cert, past_tolerance, future_tolerance) < 0) goto done; r = 0; @@ -2090,22 +2090,24 @@ tor_tls_check_lifetime(tor_tls_t *tls, int tolerance) return r; } -/** Helper: check whether cert is currently live, give or take - * tolerance seconds. If it is live, return 0. If it is not live, - * log a message and return -1. */ +/** Helper: check whether cert is expired give or take + * past_tolerance seconds, or not-yet-valid give or take + * future_tolerance seconds. If it is live, return 0. If it is not + * live, log a message and return -1. */ static int -check_cert_lifetime_internal(const X509 *cert, int tolerance) +check_cert_lifetime_internal(const X509 *cert, int past_tolerance, + int future_tolerance) { time_t now, t; now = time(NULL); - t = now + tolerance; + t = now + future_tolerance; if (X509_cmp_time(X509_get_notBefore(cert), &t) > 0) { log_cert_lifetime(cert, "not yet valid"); return -1; } - t = now - tolerance; + t = now - past_tolerance; if (X509_cmp_time(X509_get_notAfter(cert), &t) < 0) { log_cert_lifetime(cert, "already expired"); return -1; diff --git a/src/common/tortls.h b/src/common/tortls.h index d0a13cd..6791586 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -68,7 +68,8 @@ void tor_tls_free(tor_tls_t *tls); int tor_tls_peer_has_cert(tor_tls_t *tls); tor_cert_t *tor_tls_get_peer_cert(tor_tls_t *tls); int tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_env_t **identity); -int tor_tls_check_lifetime(tor_tls_t *tls, int tolerance); +int tor_tls_check_lifetime(tor_tls_t *tls, int past_tolerance, + int future_tolerance); int tor_tls_read(tor_tls_t *tls, char *cp, size_t len); int tor_tls_write(tor_tls_t *tls, const char *cp, size_t n); int tor_tls_handshake(tor_tls_t *tls);

1 0

[tor/master] Make certificate skew into a protocol warning
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 69dd993a922fcc65e931d816e1a3c916e98133f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 15 11:56:21 2011 -0500 Make certificate skew into a protocol warning --- src/common/tortls.c | 35 ++++++++++++++++++++--------------- src/common/tortls.h | 6 ++++-- src/or/command.c | 8 ++++---- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index ff0d329..a41a10d 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -212,7 +212,7 @@ static int tor_tls_context_init_one(tor_tls_context_t **ppcontext, static tor_tls_context_t *tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, int is_client); -static int check_cert_lifetime_internal(const X509 *cert, +static int check_cert_lifetime_internal(int severity, const X509 *cert, int past_tolerance, int future_tolerance); /** Global TLS contexts. We keep them here because nobody else needs @@ -945,7 +945,8 @@ tor_tls_cert_matches_key(const tor_tls_t *tls, const tor_cert_t *cert) * the key is long enough. Return 1 if the cert is good, and 0 if it's bad or * we couldn't check it. */ int -tor_tls_cert_is_valid(const tor_cert_t *cert, +tor_tls_cert_is_valid(int severity, + const tor_cert_t *cert, const tor_cert_t *signing_cert, int check_rsa_1024) { @@ -961,7 +962,8 @@ tor_tls_cert_is_valid(const tor_cert_t *cert, /* okay, the signature checked out right. Now let's check the check the * lifetime. */ - if (check_cert_lifetime_internal(cert->cert, 48*60*60, 30*24*60*60) < 0) + if (check_cert_lifetime_internal(severity, cert->cert, + 48*60*60, 30*24*60*60) < 0) return 0; cert_key = X509_get_pubkey(cert->cert); @@ -1924,7 +1926,7 @@ tor_tls_get_peer_cert(tor_tls_t *tls) /** Warn that a certificate lifetime extends through a certain range. */ static void -log_cert_lifetime(const X509 *cert, const char *problem) +log_cert_lifetime(int severity, const X509 *cert, const char *problem) { BIO *bio = NULL; BUF_MEM *buf; @@ -1934,9 +1936,10 @@ log_cert_lifetime(const X509 *cert, const char *problem) struct tm tm; if (problem) - log_warn(LD_GENERAL, - "Certificate %s: is your system clock set incorrectly?", - problem); + log(severity, LD_GENERAL, + "Certificate %s. Either their clock is set wrong, or your clock " + "is wrong.", + problem); if (!(bio = BIO_new(BIO_s_mem()))) { log_warn(LD_GENERAL, "Couldn't allocate BIO!"); goto end; @@ -1958,9 +1961,9 @@ log_cert_lifetime(const X509 *cert, const char *problem) strftime(mytime, 32, "%b %d %H:%M:%S %Y GMT", tor_gmtime_r(&now, &tm)); - log_warn(LD_GENERAL, - "(certificate lifetime runs from %s through %s. Your time is %s.)", - s1,s2,mytime); + log(severity, LD_GENERAL, + "(certificate lifetime runs from %s through %s. Your time is %s.)", + s1,s2,mytime); end: /* Not expected to get invoked */ @@ -2069,7 +2072,8 @@ tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_env_t **identity_key) * NOTE: you should call tor_tls_verify before tor_tls_check_lifetime. */ int -tor_tls_check_lifetime(tor_tls_t *tls, int past_tolerance, int future_tolerance) +tor_tls_check_lifetime(int severity, tor_tls_t *tls, + int past_tolerance, int future_tolerance) { X509 *cert; int r = -1; @@ -2077,7 +2081,8 @@ tor_tls_check_lifetime(tor_tls_t *tls, int past_tolerance, int future_tolerance) if (!(cert = SSL_get_peer_certificate(tls->ssl))) goto done; - if (check_cert_lifetime_internal(cert, past_tolerance, future_tolerance) < 0) + if (check_cert_lifetime_internal(severity, cert, + past_tolerance, future_tolerance) < 0) goto done; r = 0; @@ -2095,7 +2100,7 @@ tor_tls_check_lifetime(tor_tls_t *tls, int past_tolerance, int future_tolerance) * future_tolerance seconds. If it is live, return 0. If it is not * live, log a message and return -1. */ static int -check_cert_lifetime_internal(const X509 *cert, int past_tolerance, +check_cert_lifetime_internal(int severity, const X509 *cert, int past_tolerance, int future_tolerance) { time_t now, t; @@ -2104,12 +2109,12 @@ check_cert_lifetime_internal(const X509 *cert, int past_tolerance, t = now + future_tolerance; if (X509_cmp_time(X509_get_notBefore(cert), &t) > 0) { - log_cert_lifetime(cert, "not yet valid"); + log_cert_lifetime(severity, cert, "not yet valid"); return -1; } t = now - past_tolerance; if (X509_cmp_time(X509_get_notAfter(cert), &t) < 0) { - log_cert_lifetime(cert, "already expired"); + log_cert_lifetime(severity, cert, "already expired"); return -1; } diff --git a/src/common/tortls.h b/src/common/tortls.h index 6791586..673f18d 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -68,7 +68,8 @@ void tor_tls_free(tor_tls_t *tls); int tor_tls_peer_has_cert(tor_tls_t *tls); tor_cert_t *tor_tls_get_peer_cert(tor_tls_t *tls); int tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_env_t **identity); -int tor_tls_check_lifetime(tor_tls_t *tls, int past_tolerance, +int tor_tls_check_lifetime(int severity, + tor_tls_t *tls, int past_tolerance, int future_tolerance); int tor_tls_read(tor_tls_t *tls, char *cp, size_t len); int tor_tls_write(tor_tls_t *tls, const char *cp, size_t n); @@ -124,7 +125,8 @@ int tor_tls_get_my_certs(int server, crypto_pk_env_t *tor_tls_get_my_client_auth_key(void); crypto_pk_env_t *tor_tls_cert_get_key(tor_cert_t *cert); int tor_tls_cert_matches_key(const tor_tls_t *tls, const tor_cert_t *cert); -int tor_tls_cert_is_valid(const tor_cert_t *cert, +int tor_tls_cert_is_valid(int severity, + const tor_cert_t *cert, const tor_cert_t *signing_cert, int check_rsa_1024); diff --git a/src/or/command.c b/src/or/command.c index 5d0ebaa..a963d42 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -991,9 +991,9 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) if (! tor_tls_cert_matches_key(conn->tls, link_cert)) { ERR("The link certificate didn't match the TLS public key"); } - if (! tor_tls_cert_is_valid(link_cert, id_cert, 0)) + if (! tor_tls_cert_is_valid(LOG_PROTOCOL_WARN, link_cert, id_cert, 0)) ERR("The link certificate was not valid"); - if (! tor_tls_cert_is_valid(id_cert, id_cert, 1)) + if (! tor_tls_cert_is_valid(LOG_PROTOCOL_WARN, id_cert, id_cert, 1)) ERR("The ID certificate was not valid"); conn->handshake_state->authenticated = 1; @@ -1026,9 +1026,9 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) ERR("The certs we wanted were missing"); /* Remember these certificates so we can check an AUTHENTICATE cell */ - if (! tor_tls_cert_is_valid(auth_cert, id_cert, 1)) + if (! tor_tls_cert_is_valid(LOG_PROTOCOL_WARN, auth_cert, id_cert, 1)) ERR("The authentication certificate was not valid"); - if (! tor_tls_cert_is_valid(id_cert, id_cert, 1)) + if (! tor_tls_cert_is_valid(LOG_PROTOCOL_WARN, id_cert, id_cert, 1)) ERR("The ID certificate was not valid"); log_info(LD_OR, "Got some good certificates from %s:%d: "

1 0

[tor/master] Fix compile warnings on windows
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 4b8d2ad6f57e4e1c21b4af7f20bc7da0d3286f3d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Nov 15 13:29:32 2011 +0100 Fix compile warnings on windows --- changes/bug4469 | 4 ++++ src/common/util.c | 2 ++ src/or/connection.c | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/bug4469 b/changes/bug4469 new file mode 100644 index 0000000..e9e390c --- /dev/null +++ b/changes/bug4469 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a couple of compile warnings on Windows. Fixes bug 4469; bugfix + on 0.2.3.4-alpha and 0.2.3.6-alpha. + diff --git a/src/common/util.c b/src/common/util.c index 79e09e4..c44a4aa 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3228,6 +3228,8 @@ tor_spawn_background(const char *const filename, const char **argv, SECURITY_ATTRIBUTES saAttr; char *joined_argv; + (void)envp; // Unused on Windows + /* process_handle must not be NULL */ tor_assert(process_handle != NULL); diff --git a/src/or/connection.c b/src/or/connection.c index bf39a5c..a52bf48 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -996,6 +996,8 @@ connection_create_listener(const struct sockaddr *listensockaddr, tor_close_socket(s); goto err; } +#else + (void)options; #endif /* HAVE_SYS_UN_H */ } else { log_err(LD_BUG,"Got unexpected address family %d.",

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug4469'
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 26fcb4bb8c9d3f994a678b641db7b1c91fad8346 Merge: 3ef40f6 4b8d2ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 15 11:59:37 2011 -0500 Merge remote-tracking branch 'sebastian/bug4469' changes/bug4469 | 4 ++++ src/common/util.c | 2 ++ src/or/connection.c | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-)

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit 279fc4e02119b6099678fe94baa49b69bd51b129 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 16:45:26 2011 +0000 Update translations for vidalia_installer --- eu/vidalia_eu.po | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index bf3db27..6b0c980 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.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: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2011-11-15 16:14+0000\n" +"PO-Revision-Date: 2011-11-15 16:31+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -33,6 +33,17 @@ msgid "" "\n" "$_CLICK" msgstr "" +"Laguntzaile honek Tor, Vidalia, Polipo eta Torbutton-ren instalazioaren zehar gidatuko zaitu.\n" +"\n" +"Tor Internet anonimoki erabiltzeko sistema bat da, Web nabigazio eta argitaratzea, berehalako mezuak, IRC eta gehio anonimizatzen laguntzeko. Vidalia Tor kontrolatu, jarraitu eta konfiguratzen lagunduko dizun GUI bat da.\n" +"\n" +"Polipo Tor-en bitarteko web nabigazioaren errendimendua indartzen duen web proxy bat da.\n" +"\n" +"Torbutton web nabigazio anonimoa azkar gaitzea eta ezgaitzea ahalbidetzen duen Firefoxentzako hedapena da.\n" +"\n" +"Aurretik Tor, Vidalia, Polipo, edo Firefox instalatuta baduzu, mesedez zihurtatu ez direla exekutatzen ari instalazio honekin jarraitu baino lehenago.\n" +"\n" +"$_CLICK" msgctxt "BundleWelcomeTitle" msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard" @@ -78,6 +89,8 @@ msgid "" "\n" "$_CLICK" msgstr "" +"Laguntzaile honek Vidalia, Tor kontrolatu, jarraitu eta konfiguratzen " +"lagunduko dizun GUIaren instalazioan zehar gidatuko zaitu." msgctxt "VidaliaWelcomeTitle" msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard" @@ -118,6 +131,8 @@ msgid "" "Tor is a system for using the Internet anonymously, helping you anonymize " "Web browsing and publishing, instant messaging, IRC, and more." msgstr "" +"Tor Internet anonimoki erabiltzeko sistema bat da, Web nabigazio eta " +"argitaratzea, berehalako mezuak, IRC eta gehio anonimizatzen laguntzeko." msgctxt "TorUninstDesc" msgid "Remove ${TOR_DESC}." @@ -190,6 +205,8 @@ msgid "" "Torbutton is a Firefox extension that allows you to quickly enable or " "disable anonymous web browsing." msgstr "" +"Torbutton web nabigazio anonimoa azkar gaitzea eta ezgaitzea ahalbidetzen " +"duen Firefoxentzako hedapena da." msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." @@ -244,6 +261,9 @@ msgid "" "If you would like to install Firefox, please press Cancel, then go\n" "to the Firefox download page at" msgstr "" +"Mozilla Firefox Web nabigatzailea ez dago zure sisteman instalatuta. Tor-ek badabil beste nabigatzaile batzuekin, Internet Explorer bezala, baina Firefoxekin erabiltzea errazagoa da, eta zure anonimotasuna babesten lan hobea egiten du.\n" +"\n" +"Firefox instalatu nahi baduzu, mesedez sakatu Utzi, eta ondoren joan Firefoxen deskarga orrira hemen" msgctxt "FirefoxWarningPageLowerText" msgid "" @@ -253,5 +273,8 @@ msgid "" "Or, if you would prefer to install Tor without Firefox, simply\n" "press Next to continue." msgstr "" +"Behin Firefox instalatu duzunean, Tor instalaria berriz exekutatu dezakezu.\n" +"\n" +"Edo, nahiago baduzu Tor instalatu Firefoxik gabe, sakatu Aurrera besterik gabe."

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit 1fb1e51802c46be0282fd8f894129af5c2e4be15 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 16:45:03 2011 +0000 Update translations for gettor --- eu/gettor.po | 482 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 482 insertions(+), 0 deletions(-) diff --git a/eu/gettor.po b/eu/gettor.po new file mode 100644 index 0000000..0418cb3 --- /dev/null +++ b/eu/gettor.po @@ -0,0 +1,482 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <baldarra(a)euskalerria.org>, 2011. +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-15 16:44+0000\n" +"Last-Translator: baldarra <baldarra(a)euskalerria.org>\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: eu\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "Kaixo, Heu \"GetTor\" errobota da." + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "Eskerrik asko zure eskaeragatik." + +#: 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 "" + +#: 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: help(a)rt.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 "" +"Tor pakete bat bidaliko dizut e-mailez, zein nahi duzun esaten badidazu.\n" +"Mesedez hautatu hurrengo pakete izenetatik bat:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" + +#: 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 "Hemen duzu hizkuntza erabilgarri guztien zerrenda:" + +#: 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: 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" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "Hizkuntzarik hautatu ezean, Ingelerazko bertsoa jasoko duzu." + +#: 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 "" + +#: 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.) Gorde jasotako eranskin guztiak karpeta bakar batean zure diskan." + +#: 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 "" +"3.) Egiaztatu mailean jasotako fitxategi guztiak pakete bakoitzarekin. (gpg " +"--verify)" + +#: 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 "" +"6.) Hori da. Bukatu duzu. Eskerrik asko Tor erabiltzeagatik eta ondo pasa!" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" +"LAGUNTZA\n" +"========" + +#: 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 "" + +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + +

1 0

[tor/master] Use real_addr in send_netinfo
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 22:42:10 2011 -0500 Use real_addr in send_netinfo Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349. --- changes/bug4349 | 4 ++++ src/or/connection_or.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug4349 b/changes/bug4349 new file mode 100644 index 0000000..633916b --- /dev/null +++ b/changes/bug4349 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When sending a NETINFO cell, include the original address + received for the other side, not its canonical address. Found + by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 27a34d3..1fffba7 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1410,7 +1410,7 @@ connection_or_send_netinfo(or_connection_t *conn) /* Their address. */ out = cell.payload + 4; - len = append_address_to_payload(out, &conn->_base.addr); + len = append_address_to_payload(out, &conn->real_addr); if (len<0) return -1; out += len;

1 0

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

15 Nov '11

commit 3ef40f69937abc105877189fbecd78df67dd2d8e Merge: 4af82fb 5bea660 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 15 11:42:38 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4349 | 4 ++++ src/or/connection_or.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0