- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Fix comment about TLSv1_method() per comments by wanoskarnet
by nickm＠torproject.org 09 Jan '12

09 Jan '12

commit c78a314e95ef7f0d05e9d58066ee6bf6795ee9d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 9 16:40:21 2012 -0500 Fix comment about TLSv1_method() per comments by wanoskarnet --- src/common/tortls.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 37074de..f7a15b0 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -777,15 +777,10 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, } #if 0 - /* Tell OpenSSL to only use TLS1. This would actually break compatibility - * with clients that are configured to use SSLv23_method(), so we should - * probably never use it. - */ - /* XXX wanoskarnet says this comment is bunk -- that even if we turn - * this line on, clients configured to use SSLv23 would still able to - * talk to us. But he also says it's ok to leave it out. I suggest we - * delete this whole clause (the one that's #if 0'ed out). I'll leave - * it in place until Nick expresses an opinion. -RD */ + /* Tell OpenSSL to only use TLS1. This may have subtly different results + * from SSLv23_method() with SSLv2 and SSLv3 disabled, so we need to do some + * investigation before we consider adjusting it. It should be compatible + * with existing Tors. */ if (!(result->ctx = SSL_CTX_new(TLSv1_method()))) goto error; #endif

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 09 Jan '12

09 Jan '12

commit d05a61171a5d9615830d07b493e96d31353f211a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 17:45:13 2012 +0000 Update translations for vidalia --- uk/vidalia_uk.po | 192 +++++++++++++++++++++++++++--------------------------- 1 files changed, 97 insertions(+), 95 deletions(-) diff --git a/uk/vidalia_uk.po b/uk/vidalia_uk.po index 0c1abbb..05220a1 100644 --- a/uk/vidalia_uk.po +++ b/uk/vidalia_uk.po @@ -1,13 +1,13 @@ # # Translators: -# <demonuk9(a)gmail.com>, 2011. +# <demonuk9(a)gmail.com>, 2011, 2012. # runasand <runa.sandvik(a)gmail.com>, 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-07 14:40+0000\n" -"PO-Revision-Date: 2011-09-08 00:47+0000\n" +"PO-Revision-Date: 2012-01-09 17:37+0000\n" "Last-Translator: PoopZemli <demonuk9(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -349,11 +349,11 @@ msgstr "" msgctxt "Circuit" msgid "Closed" -msgstr "" +msgstr "Закритий" msgctxt "Circuit" msgid "Unknown" -msgstr "" +msgstr "Невідомий" msgctxt "CircuitItem" msgid "<Path Empty>" @@ -361,11 +361,11 @@ msgstr "" msgctxt "CircuitListWidget" msgid "Connection" -msgstr "" +msgstr "З'єднання" msgctxt "CircuitListWidget" msgid "Status" -msgstr "" +msgstr "Статус" msgctxt "CircuitListWidget" msgid "Zoom to Circuit" @@ -393,23 +393,23 @@ msgstr "" msgctxt "ConfigDialog" msgid "Services" -msgstr "" +msgstr "Сервіси" msgctxt "ConfigDialog" msgid "Appearance" -msgstr "" +msgstr "Зовнішній вигляд" msgctxt "ConfigDialog" msgid "Advanced" -msgstr "" +msgstr "Розширено" msgctxt "ConfigDialog" msgid "Help" -msgstr "" +msgstr "Допомога" msgctxt "ConfigDialog" msgid "Error Saving Settings" -msgstr "" +msgstr "Помилка збереження налаштувань" msgctxt "ConfigDialog" msgid "Vidalia was unable to save your %1 settings." @@ -417,7 +417,7 @@ msgstr "" msgctxt "ConfigDialog" msgid "Error Applying Settings" -msgstr "" +msgstr "Помилка застосування налаштувань" msgctxt "ConfigDialog" msgid "Vidalia was unable to apply your %1 settings to Tor." @@ -425,11 +425,11 @@ msgstr "" msgctxt "ConfigDialog" msgid "Settings" -msgstr "" +msgstr "Налаштування" msgctxt "ControlConnection" msgid "Vidalia was unable to connect to Tor. (%1)" -msgstr "" +msgstr "Vidalia не змогла під'єднатися до Tor. (%1)" msgctxt "ControlConnection" msgid "Control socket is not connected." @@ -437,7 +437,7 @@ msgstr "" msgctxt "ControlPasswordInputDialog" msgid "Password Required" -msgstr "" +msgstr "Потрібно пароль" msgctxt "ControlPasswordInputDialog" msgid "Remember my password" @@ -448,10 +448,12 @@ msgid "" "Vidalia has connected to a running Tor process that requires a password. " "Please enter your control password:" msgstr "" +"Vidalia під'єдналася до запущеного процесу Tor, який вимагає пароль. Будь " +"ласка, введіть пароль:" msgctxt "ControlSocket" msgid "Control socket is not connected." -msgstr "" +msgstr "Контрольний сокет не під'єднано" msgctxt "ControlSocket" msgid "Error sending control command. [%1]" @@ -463,19 +465,19 @@ msgstr "" msgctxt "ControlSocket" msgid "Invalid control reply. [%1]" -msgstr "" +msgstr "Хибна контрольна відповідь. [%1]" msgctxt "CountryInfo" msgid "Afghanistan" -msgstr "" +msgstr "Авганістан" msgctxt "CountryInfo" msgid "Andorra" -msgstr "" +msgstr "Андорра" msgctxt "CountryInfo" msgid "Angola" -msgstr "" +msgstr "Ангола" msgctxt "CountryInfo" msgid "Antigua & Barbuda" @@ -483,27 +485,27 @@ msgstr "" msgctxt "CountryInfo" msgid "Argentina" -msgstr "" +msgstr "Аргентина" msgctxt "CountryInfo" msgid "Armenia" -msgstr "" +msgstr "Вірменія" msgctxt "CountryInfo" msgid "Australia" -msgstr "" +msgstr "Австралія" msgctxt "CountryInfo" msgid "Azerbaijan" -msgstr "" +msgstr "Азербайджан" msgctxt "CountryInfo" msgid "Bahamas" -msgstr "" +msgstr "Багами" msgctxt "CountryInfo" msgid "Bangladesh" -msgstr "" +msgstr "Бангладеш" msgctxt "CountryInfo" msgid "Barbados" @@ -511,15 +513,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Belarus" -msgstr "" +msgstr "Білорусь" msgctxt "CountryInfo" msgid "Belgium" -msgstr "" +msgstr "Бельгія" msgctxt "CountryInfo" msgid "Belize" -msgstr "" +msgstr "Беліз" msgctxt "CountryInfo" msgid "Bhutan" @@ -527,11 +529,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Bolivia" -msgstr "" +msgstr "Болівія" msgctxt "CountryInfo" msgid "Bosnia & Herzegovina" -msgstr "" +msgstr "Боснія і Герцоговина" msgctxt "CountryInfo" msgid "Botswana" @@ -539,7 +541,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Brazil" -msgstr "" +msgstr "Бразилія" msgctxt "CountryInfo" msgid "Brunei Darussalam" @@ -547,7 +549,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Bulgaria" -msgstr "" +msgstr "Болгарія" msgctxt "CountryInfo" msgid "Burkina Faso" @@ -563,11 +565,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Cameroon" -msgstr "" +msgstr "Камерун" msgctxt "CountryInfo" msgid "Canada" -msgstr "" +msgstr "Канада" msgctxt "CountryInfo" msgid "Cape Verde" @@ -575,19 +577,19 @@ msgstr "" msgctxt "CountryInfo" msgid "Central African Republic" -msgstr "" +msgstr "Центральна Африканська Республіка" msgctxt "CountryInfo" msgid "Chad" -msgstr "" +msgstr "Чад" msgctxt "CountryInfo" msgid "Chile" -msgstr "" +msgstr "Чилі" msgctxt "CountryInfo" msgid "China" -msgstr "" +msgstr "Китай" msgctxt "CountryInfo" msgid "Colombia" @@ -603,7 +605,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Congo" -msgstr "" +msgstr "Конго" msgctxt "CountryInfo" msgid "Costa Rica" @@ -615,51 +617,51 @@ msgstr "" msgctxt "CountryInfo" msgid "Croatia" -msgstr "" +msgstr "Хорватія" msgctxt "CountryInfo" msgid "Cuba" -msgstr "" +msgstr "Куба" msgctxt "CountryInfo" msgid "Cyprus" -msgstr "" +msgstr "Кіпр" msgctxt "CountryInfo" msgid "Czech Republic" -msgstr "" +msgstr "Чеська Республіка" msgctxt "CountryInfo" msgid "Denmark" -msgstr "" +msgstr "Данія" msgctxt "CountryInfo" msgid "Djibouti" -msgstr "" +msgstr "Джибуті" msgctxt "CountryInfo" msgid "Dominica" -msgstr "" +msgstr "Домініка" msgctxt "CountryInfo" msgid "Dominican Republic" -msgstr "" +msgstr "Домініканська Республіка" msgctxt "CountryInfo" msgid "Ecuador" -msgstr "" +msgstr "Еквадор" msgctxt "CountryInfo" msgid "Egypt" -msgstr "" +msgstr "Єгипет" msgctxt "CountryInfo" msgid "El Salvador" -msgstr "" +msgstr "Сальвадор" msgctxt "CountryInfo" msgid "Equatorial Guinea" -msgstr "" +msgstr "Екваторіальна Гвінея" msgctxt "CountryInfo" msgid "Eritrea" @@ -667,11 +669,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Estonia" -msgstr "" +msgstr "Естонія" msgctxt "CountryInfo" msgid "France" -msgstr "" +msgstr "Франція" msgctxt "CountryInfo" msgid "Gabon" @@ -687,7 +689,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Germany" -msgstr "" +msgstr "Німеччина" msgctxt "CountryInfo" msgid "Ghana" @@ -703,7 +705,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Guinea" -msgstr "" +msgstr "Гвінея" msgctxt "CountryInfo" msgid "Guinea-Bissau" @@ -715,7 +717,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Hong Kong" -msgstr "" +msgstr "Гонконг" msgctxt "CountryInfo" msgid "Haiti" @@ -727,31 +729,31 @@ msgstr "" msgctxt "CountryInfo" msgid "Israel" -msgstr "" +msgstr "Ізраїль" msgctxt "CountryInfo" msgid "Italy" -msgstr "" +msgstr "Італія" msgctxt "CountryInfo" msgid "Jamaica" -msgstr "" +msgstr "Ямайка" msgctxt "CountryInfo" msgid "Japan" -msgstr "" +msgstr "Японія" msgctxt "CountryInfo" msgid "Jordan" -msgstr "" +msgstr "Йорданія" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "" +msgstr "Казахстан" msgctxt "CountryInfo" msgid "Kenya" -msgstr "" +msgstr "Кенія" msgctxt "CountryInfo" msgid "Kiribati" @@ -759,11 +761,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Kuwait" -msgstr "" +msgstr "Кувейт" msgctxt "CountryInfo" msgid "Kyrgyzstan" -msgstr "" +msgstr "Киргизія" msgctxt "CountryInfo" msgid "Laos" @@ -771,7 +773,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Latvia" -msgstr "" +msgstr "Латвія" msgctxt "CountryInfo" msgid "Lebanon" @@ -783,23 +785,23 @@ msgstr "" msgctxt "CountryInfo" msgid "Liberia" -msgstr "" +msgstr "Ліберія" msgctxt "CountryInfo" msgid "Liechtenstein" -msgstr "" +msgstr "Ліхтенштейн" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "Литва" msgctxt "CountryInfo" msgid "Luxembourg" -msgstr "" +msgstr "Люксембург" msgctxt "CountryInfo" msgid "Macedonia" -msgstr "" +msgstr "Македонія" msgctxt "CountryInfo" msgid "Madagascar" @@ -815,11 +817,11 @@ msgstr "" msgctxt "CountryInfo" msgid "Mali" -msgstr "" +msgstr "Малі" msgctxt "CountryInfo" msgid "Malta" -msgstr "" +msgstr "Мальта" msgctxt "CountryInfo" msgid "Marshall Islands" @@ -839,15 +841,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Moldova" -msgstr "" +msgstr "Молдова" msgctxt "CountryInfo" msgid "Monaco" -msgstr "" +msgstr "Монако" msgctxt "CountryInfo" msgid "Mongolia" -msgstr "" +msgstr "Монголія" msgctxt "CountryInfo" msgid "Montenegro" @@ -855,15 +857,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Morocco" -msgstr "" +msgstr "Марокко" msgctxt "CountryInfo" msgid "Mozambique" -msgstr "" +msgstr "Мозамбік" msgctxt "CountryInfo" msgid "Namibia" -msgstr "" +msgstr "Намібія" msgctxt "CountryInfo" msgid "Nauru" @@ -871,15 +873,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Nepal" -msgstr "" +msgstr "Непал" msgctxt "CountryInfo" msgid "Netherlands" -msgstr "" +msgstr "Нідерланди" msgctxt "CountryInfo" msgid "New Zealand" -msgstr "" +msgstr "Нова Зеландія" msgctxt "CountryInfo" msgid "Nicaragua" @@ -887,15 +889,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Niger" -msgstr "" +msgstr "Нігер" msgctxt "CountryInfo" msgid "Nigeria" -msgstr "" +msgstr "Нігерія" msgctxt "CountryInfo" msgid "Norway" -msgstr "" +msgstr "Норвегія" msgctxt "CountryInfo" msgid "Oman" @@ -903,7 +905,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Pakistan" -msgstr "" +msgstr "Пакистан" msgctxt "CountryInfo" msgid "Palau" @@ -911,35 +913,35 @@ msgstr "" msgctxt "CountryInfo" msgid "Palestine" -msgstr "" +msgstr "Палестина" msgctxt "CountryInfo" msgid "Panama" -msgstr "" +msgstr "Панама" msgctxt "CountryInfo" msgid "Papua New Guinea" -msgstr "" +msgstr "Папуа Нова Гвінея" msgctxt "CountryInfo" msgid "Paraguay" -msgstr "" +msgstr "Парагвай" msgctxt "CountryInfo" msgid "Peru" -msgstr "" +msgstr "Перу" msgctxt "CountryInfo" msgid "Philippines" -msgstr "" +msgstr "Філіппіни" msgctxt "CountryInfo" msgid "Poland" -msgstr "" +msgstr "Польща" msgctxt "CountryInfo" msgid "Portugal" -msgstr "" +msgstr "Португалія" msgctxt "CountryInfo" msgid "Qatar"

1 0

[tor/master] Fix a trivial log message error in renservice.c
by nickm＠torproject.org 09 Jan '12

09 Jan '12

commit 6fd61cf767c0680707e034d9e6a4d46b44bd10af Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 9 12:21:04 2012 -0500 Fix a trivial log message error in renservice.c Fixes bug 4856; bugfix on 0.0.6 This bug was introduced in 79fc5217, back in 2004. --- changes/bug4856 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug4856 b/changes/bug4856 new file mode 100644 index 0000000..fa284a0 --- /dev/null +++ b/changes/bug4856 @@ -0,0 +1,3 @@ + o Trivial bugfixes + - Fix a typo in a log message in rend_service_rendezvous_has_opened(). + Fixes bug 4856; bugfix on Tor 0.0.6. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 25695c5..bb3aacd 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1564,7 +1564,7 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) circuit->rend_data->rend_pk_digest); if (!service) { log_warn(LD_GENERAL, "Internal error: unrecognized service ID on " - "introduction circuit."); + "rendezvous circuit."); reason = END_CIRC_REASON_INTERNAL; goto err; }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 09 Jan '12

09 Jan '12

commit 838ec086beeb83d10e1c50b2027fe7509e153c8c Merge: d4de312 6fd61cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 9 12:22:29 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4856 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Fix a trivial log message error in renservice.c
by nickm＠torproject.org 09 Jan '12

09 Jan '12

commit 6fd61cf767c0680707e034d9e6a4d46b44bd10af Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 9 12:21:04 2012 -0500 Fix a trivial log message error in renservice.c Fixes bug 4856; bugfix on 0.0.6 This bug was introduced in 79fc5217, back in 2004. --- changes/bug4856 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug4856 b/changes/bug4856 new file mode 100644 index 0000000..fa284a0 --- /dev/null +++ b/changes/bug4856 @@ -0,0 +1,3 @@ + o Trivial bugfixes + - Fix a typo in a log message in rend_service_rendezvous_has_opened(). + Fixes bug 4856; bugfix on Tor 0.0.6. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 25695c5..bb3aacd 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1564,7 +1564,7 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) circuit->rend_data->rend_pk_digest); if (!service) { log_warn(LD_GENERAL, "Internal error: unrecognized service ID on " - "introduction circuit."); + "rendezvous circuit."); reason = END_CIRC_REASON_INTERNAL; goto err; }

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 09 Jan '12

09 Jan '12

commit 60d0dd34c3ccace5a0955a65eb1178441c2d4fe6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 17:15:04 2012 +0000 Update translations for tsum --- uk/tsum.po | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/uk/tsum.po b/uk/tsum.po index fa3d0b4..ee43045 100644 --- a/uk/tsum.po +++ b/uk/tsum.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <demonuk9(a)gmail.com>, 2012. # <jonny_nut(a)hotmail.com>, 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-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-28 03:05+0000\n" -"Last-Translator: jonny_nut <jonny_nut(a)hotmail.com>\n" +"PO-Revision-Date: 2012-01-09 17:11+0000\n" +"Last-Translator: PoopZemli <demonuk9(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #. type: Plain text #: en/tsum.text:2 msgid "# The Short User Manual\n" -msgstr "" +msgstr "# Короткий посібник користувача\n" #. type: Plain text #: en/tsum.text:7 @@ -284,6 +285,8 @@ msgid "" "To verify the signature of the package you downloaded, run the following " "command:" msgstr "" +"Для того, щоб перевірити сигнатуру пакунку, який ви завантажили, виконайте " +"наступну команду:" #. type: Plain text #: en/tsum.text:134 @@ -292,6 +295,8 @@ msgid "" "\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" "US.exe\n" msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>gpg --verify tor-" +"browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe\n" #. type: Plain text #: en/tsum.text:140 @@ -466,6 +471,8 @@ msgid "" "## Frequently Asked Questions\n" "This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." msgstr "" +"## Часті питання\n" +"Цей розділ дасть відповіді на деякі найбільш поширені запитання. Якщо ваше питання не згадується тут, надішліть електронного листа на адресу help(a)rt.torproject.org." #. type: Plain text #: en/tsum.text:244 @@ -574,6 +581,8 @@ msgid "" "### Flash does not work\n" "For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity." msgstr "" +"### Flash не працює\n" +"З міркувань безпеки Flash, Java та інші плагіни вимнені. Вони працюють незалежно від Firefox та можуть виконати дії, які зруйнують вашу анонімність." #. type: Plain text #: en/tsum.text:308

1 0

[tor/master] Don't remove rend cpath element from relaunched service-side rend circs
by nickm＠torproject.org 09 Jan '12

09 Jan '12

commit b46a7ebb2bf2cae94a9ce4447c55014dd90ad868 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jan 6 22:44:20 2012 -0800 Don't remove rend cpath element from relaunched service-side rend circs Fixes bug 4842, not in any release. --- src/or/circuitlist.c | 14 ++++++++++++++ src/or/or.h | 15 +++++++++++++++ src/or/rendservice.c | 33 +++++++++++++++++++++++++++------ 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 97b6162..319acdb 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -39,6 +39,7 @@ static smartlist_t *circuits_pending_or_conns=NULL; static void circuit_free(circuit_t *circ); static void circuit_free_cpath(crypt_path_t *cpath); static void circuit_free_cpath_node(crypt_path_t *victim); +static void cpath_ref_decref(crypt_path_reference_t *cpath_ref); /********* END VARIABLES ************/ @@ -600,6 +601,7 @@ circuit_free(circuit_t *circ) if (ocirc->build_state) { extend_info_free(ocirc->build_state->chosen_exit); circuit_free_cpath_node(ocirc->build_state->pending_final_cpath); + cpath_ref_decref(ocirc->build_state->service_pending_final_cpath_ref); } tor_free(ocirc->build_state); @@ -723,6 +725,18 @@ circuit_free_cpath_node(crypt_path_t *victim) tor_free(victim); } +/** Release a crypt_path_reference_t*, which may be NULL. */ +static void +cpath_ref_decref(crypt_path_reference_t *cpath_ref) +{ + if (cpath_ref != NULL) { + if (--(cpath_ref->refcount) == 0) { + circuit_free_cpath_node(cpath_ref->cpath); + tor_free(cpath_ref); + } + } +} + /** A helper function for circuit_dump_by_conn() below. Log a bunch * of information about circuit <b>circ</b>. */ diff --git a/src/or/or.h b/src/or/or.h index 2acb621..8fe3e0f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2406,6 +2406,18 @@ typedef struct crypt_path_t { * at this step? */ } crypt_path_t; +/** A reference-counted pointer to a crypt_path_t, used only to share + * the final rendezvous cpath to be used on a service-side rendezvous + * circuit among multiple circuits built in parallel to the same + * destination rendezvous point. */ +typedef struct { + /** The reference count. */ + unsigned int refcount; + /** The pointer. Set to NULL when the crypt_path_t is put into use + * on an opened rendezvous circuit. */ + crypt_path_t *cpath; +} crypt_path_reference_t; + #define CPATH_KEY_MATERIAL_LEN (20*2+16*2) #define DH_KEY_LEN DH_BYTES @@ -2432,6 +2444,9 @@ typedef struct { unsigned int onehop_tunnel : 1; /** The crypt_path_t to append after rendezvous: used for rendezvous. */ crypt_path_t *pending_final_cpath; + /** A ref-counted reference to the crypt_path_t to append after + * rendezvous; used on the service side. */ + crypt_path_reference_t *service_pending_final_cpath_ref; /** How many times has building a circuit for this task failed? */ int failure_count; /** At what time should we give up on this task? */ diff --git a/src/or/rendservice.c b/src/or/rendservice.c index bbc9c91..fc4d878 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1385,7 +1385,12 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, memcpy(launched->rend_data->rend_cookie, r_cookie, REND_COOKIE_LEN); strlcpy(launched->rend_data->onion_address, service->service_id, sizeof(launched->rend_data->onion_address)); - launched->build_state->pending_final_cpath = cpath = + + launched->build_state->service_pending_final_cpath_ref = + tor_malloc_zero(sizeof(crypt_path_reference_t)); + launched->build_state->service_pending_final_cpath_ref->refcount = 1; + + launched->build_state->service_pending_final_cpath_ref->cpath = cpath = tor_malloc_zero(sizeof(crypt_path_t)); cpath->magic = CRYPT_PATH_MAGIC; launched->build_state->expiry_time = now + MAX_REND_TIMEOUT; @@ -1445,7 +1450,7 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc) oldstate = oldcirc->build_state; tor_assert(oldstate); - if (oldstate->pending_final_cpath == NULL) { + if (oldstate->service_pending_final_cpath_ref == NULL) { log_info(LD_REND,"Skipping relaunch of circ that failed on its first hop. " "Initiator will retry."); return; @@ -1467,8 +1472,9 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc) tor_assert(newstate); newstate->failure_count = oldstate->failure_count+1; newstate->expiry_time = oldstate->expiry_time; - newstate->pending_final_cpath = oldstate->pending_final_cpath; - oldstate->pending_final_cpath = NULL; + newstate->service_pending_final_cpath_ref = + oldstate->service_pending_final_cpath_ref; + ++(newstate->service_pending_final_cpath_ref->refcount); newcirc->rend_data = rend_data_dup(oldcirc->rend_data); } @@ -1726,8 +1732,7 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) tor_assert(!(circuit->build_state->onehop_tunnel)); #endif tor_assert(circuit->rend_data); - hop = circuit->build_state->pending_final_cpath; - tor_assert(hop); + hop = circuit->build_state->service_pending_final_cpath_ref->cpath; base16_encode(hexcookie,9,circuit->rend_data->rend_cookie,4); base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, @@ -1743,6 +1748,22 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) * no effect on Tor's behaviour. */ circuit->hs_circ_has_timed_out = 0; + /* If hop is NULL, another rend circ has already connected to this + * rend point. Close this circ. */ + if (hop == NULL) { + log_info(LD_REND, "Another rend circ has already reached this rend point; " + "closing this rend circ."); + reason = END_CIRC_REASON_NONE; + goto err; + } + + /* Remove our final cpath element from the reference, so that no + * other circuit will try to use it. Store it in + * pending_final_cpath for now to ensure that it will be freed if + * our rendezvous attempt fails. */ + circuit->build_state->pending_final_cpath = hop; + circuit->build_state->service_pending_final_cpath_ref->cpath = NULL; + service = rend_service_get_by_pk_digest( circuit->rend_data->rend_pk_digest); if (!service) {

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug4842'
by nickm＠torproject.org 09 Jan '12

09 Jan '12

commit d4de312b3c020c031d550fcd07967283580d3c14 Merge: ecdea4e b46a7eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 9 11:59:08 2012 -0500 Merge remote-tracking branch 'rransom-tor/bug4842' src/or/circuitlist.c | 14 ++++++++++++++ src/or/or.h | 15 +++++++++++++++ src/or/rendservice.c | 33 +++++++++++++++++++++++++++------ 3 files changed, 56 insertions(+), 6 deletions(-)

1 0

[metrics-db/master] Copy recently processed files to an rsync/ directory.
by karsten＠torproject.org 09 Jan '12

09 Jan '12

commit e6a0e94535014926c6df53ed728e108a30d6386b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 9 11:57:11 2012 +0100 Copy recently processed files to an rsync/ directory. --- config.template | 10 ++ src/org/torproject/ernie/db/Configuration.java | 13 ++ src/org/torproject/ernie/db/Main.java | 13 ++ src/org/torproject/ernie/db/RsyncDataProvider.java | 146 ++++++++++++++++++++ 4 files changed, 182 insertions(+), 0 deletions(-) diff --git a/config.template b/config.template index dc5d30e..6cfdce5 100644 --- a/config.template +++ b/config.template @@ -112,4 +112,14 @@ # ## Download exit list and store it to disk #DownloadExitList 0 +# +# +######## Rsync directory ######## +# +## Copy recently published decriptors to another directory to provide them +## via rsync +#ProvideFilesViaRsync 0 +# +## Relative path to the directory that shall be provided via rsync +#RsyncDirectory rsync/ diff --git a/src/org/torproject/ernie/db/Configuration.java b/src/org/torproject/ernie/db/Configuration.java index b4e6f8b..7197c7d 100644 --- a/src/org/torproject/ernie/db/Configuration.java +++ b/src/org/torproject/ernie/db/Configuration.java @@ -49,6 +49,8 @@ public class Configuration { private boolean processBridgePoolAssignments = false; private String assignmentsDirectory = "assignments/"; private String sanitizedAssignmentsDirectory = "sanitized-assignments/"; + private boolean provideFilesViaRsync = false; + private String rsyncDirectory = "rsync"; public Configuration() { /* Initialize logger. */ @@ -168,6 +170,11 @@ public class Configuration { this.assignmentsDirectory = line.split(" ")[1]; } else if (line.startsWith("SanitizedAssignmentsDirectory")) { this.sanitizedAssignmentsDirectory = line.split(" ")[1]; + } else if (line.startsWith("ProvideFilesViaRsync")) { + this.provideFilesViaRsync = Integer.parseInt( + line.split(" ")[1]) != 0; + } else if (line.startsWith("RsyncDirectory")) { + this.rsyncDirectory = line.split(" ")[1]; } else { logger.severe("Configuration file contains unrecognized " + "configuration key in line '" + line + "'! Exiting!"); @@ -317,5 +324,11 @@ public class Configuration { public String getSanitizedAssignmentsDirectory() { return sanitizedAssignmentsDirectory; } + public boolean getProvideFilesViaRsync() { + return this.provideFilesViaRsync; + } + public String getRsyncDirectory() { + return this.rsyncDirectory; + } } diff --git a/src/org/torproject/ernie/db/Main.java b/src/org/torproject/ernie/db/Main.java index 5a06900..a20748a 100644 --- a/src/org/torproject/ernie/db/Main.java +++ b/src/org/torproject/ernie/db/Main.java @@ -136,6 +136,19 @@ public class Main { new File(config.getSanitizedAssignmentsDirectory())); } + // Copy recently published files to a local directory that can then + // be served via rsync. + if (config.getProvideFilesViaRsync()) { + new RsyncDataProvider( + config.getDirectoryArchivesOutputDirectory() == null ? null : + new File(config.getDirectoryArchivesOutputDirectory()), + config.getSanitizedBridgesWriteDirectory() == null ? null : + new File(config.getSanitizedBridgesWriteDirectory()), + config.getSanitizedAssignmentsDirectory() == null ? null : + new File(config.getSanitizedAssignmentsDirectory()), + new File(config.getRsyncDirectory())); + } + // Remove lock file lf.releaseLock(); diff --git a/src/org/torproject/ernie/db/RsyncDataProvider.java b/src/org/torproject/ernie/db/RsyncDataProvider.java new file mode 100644 index 0000000..1f0d68f --- /dev/null +++ b/src/org/torproject/ernie/db/RsyncDataProvider.java @@ -0,0 +1,146 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.ernie.db; + +import java.io.*; +import java.util.*; + +/** + * Copy files published in the last 3 days to a local directory that can + * then be served via rsync. + */ +public class RsyncDataProvider { + public RsyncDataProvider(File directoryArchivesOutputDirectory, + File sanitizedBridgesWriteDirectory, + File sanitizedAssignmentsDirectory, File rsyncDirectory) { + + /* Determine the cut-off time for files in rsync/. */ + long cutOffMillis = System.currentTimeMillis() + - 3L * 24L * 60L * 60L * 1000L; + + /* Create rsync/ directory if it doesn't exist. */ + if (!rsyncDirectory.exists()) { + rsyncDirectory.mkdirs(); + } + + /* Make a list of all files in the rsync/ directory to delete those + * that we didn't copy in this run. */ + Set<String> fileNamesInRsync = new HashSet<String>(); + Stack<File> files = new Stack<File>(); + files.add(rsyncDirectory); + while (!files.isEmpty()) { + File pop = files.pop(); + if (pop.isDirectory()) { + files.addAll(Arrays.asList(pop.listFiles())); + } else { + fileNamesInRsync.add(pop.getName()); + } + } + + /* Copy relay descriptors from the last 3 days. */ + if (directoryArchivesOutputDirectory != null) { + files.add(directoryArchivesOutputDirectory); + while (!files.isEmpty()) { + File pop = files.pop(); + if (pop.isDirectory()) { + files.addAll(Arrays.asList(pop.listFiles())); + } else if (pop.lastModified() >= cutOffMillis) { + String fileName = pop.getName(); + if (pop.getAbsolutePath().contains("/consensus/")) { + this.copyFile(pop, new File(rsyncDirectory, + "relay-descriptors/consensuses/" + fileName)); + } else if (pop.getAbsolutePath().contains("/vote/")) { + this.copyFile(pop, new File(rsyncDirectory, + "relay-descriptors/votes/" + fileName)); + } else if (pop.getAbsolutePath().contains( + "/server-descriptor/")) { + this.copyFile(pop, new File(rsyncDirectory, + "relay-descriptors/server-descriptors/" + fileName)); + } else if (pop.getAbsolutePath().contains("/extra-info/")) { + this.copyFile(pop, new File(rsyncDirectory, + "relay-descriptors/extra-infos/" + fileName)); + } else { + continue; + } + fileNamesInRsync.remove(pop.getName()); + } + } + } + + /* Copy sanitized bridge descriptors from the last 3 days. */ + if (sanitizedBridgesWriteDirectory != null) { + files.add(sanitizedBridgesWriteDirectory); + while (!files.isEmpty()) { + File pop = files.pop(); + if (pop.isDirectory()) { + files.addAll(Arrays.asList(pop.listFiles())); + } else if (pop.lastModified() >= cutOffMillis) { + String fileName = pop.getName(); + if (pop.getAbsolutePath().contains("/statuses/")) { + this.copyFile(pop, new File(rsyncDirectory, + "bridge-descriptors/statuses/" + fileName)); + } else if (pop.getAbsolutePath().contains( + "/server-descriptors/")) { + this.copyFile(pop, new File(rsyncDirectory, + "bridge-descriptors/server-descriptors/" + fileName)); + } else if (pop.getAbsolutePath().contains("/extra-infos/")) { + this.copyFile(pop, new File(rsyncDirectory, + "bridge-descriptors/extra-infos/" + fileName)); + } else { + continue; + } + fileNamesInRsync.remove(pop.getName()); + } + } + } + + /* Copy sanitized bridge pool assignments from the last 3 days. */ + if (sanitizedAssignmentsDirectory != null) { + files.add(sanitizedAssignmentsDirectory); + while (!files.isEmpty()) { + File pop = files.pop(); + if (pop.isDirectory()) { + files.addAll(Arrays.asList(pop.listFiles())); + } else if (pop.lastModified() >= cutOffMillis) { + String fileName = pop.getName(); + this.copyFile(pop, new File(rsyncDirectory, + "bridge-pool-assignments/" + fileName)); + fileNamesInRsync.remove(pop.getName()); + } + } + } + + /* Delete all files that we didn't (over-)write in this run. */ + files.add(rsyncDirectory); + while (!files.isEmpty()) { + File pop = files.pop(); + if (pop.isDirectory()) { + files.addAll(Arrays.asList(pop.listFiles())); + } else if (fileNamesInRsync.contains(pop.getName())) { + pop.delete(); + } + } + } + + private void copyFile(File from, File to) { + if (to.exists()) { + return; + } + try { + to.getParentFile().mkdirs(); + FileInputStream fis = new FileInputStream(from); + BufferedInputStream bis = new BufferedInputStream(fis); + FileOutputStream fos = new FileOutputStream(to); + int len; + byte[] data = new byte[1024]; + while ((len = bis.read(data, 0, 1024)) >= 0) { + fos.write(data, 0, len); + } + bis.close(); + fos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} +

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 09 Jan '12

09 Jan '12

commit 9d836b2f056a93d698dca22326d4d6ebf44550d7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 13:45:22 2012 +0000 Update translations for vidalia_help --- nl/bridges.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nl/bridges.po b/nl/bridges.po index 8f4a5ac..def8356 100644 --- a/nl/bridges.po +++ b/nl/bridges.po @@ -1,13 +1,14 @@ # # Translators: # Shondoit Walker <shondoit+transifex(a)gmail.com>, 2011. +# <zero.point.transifex(a)tweebs.nl>, 2012. msgid "" 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 16:58+0200\n" -"PO-Revision-Date: 2011-11-19 19:24+0000\n" -"Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-09 13:35+0000\n" +"Last-Translator: Zero.Point <zero.point.transifex(a)tweebs.nl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -124,6 +125,6 @@ msgid "" "stable, in case some of the bridges become unreachable." msgstr "" "Meer dan één bridge adres instellen zorgt er voor dat je Tor verbinding " -"stabieler wordt, in het geval dat sommige bridges onbereikbaar zijn." +"stabieler wordt voor het geval dat sommige bridges onbereikbaar zijn."

1 0