- tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Nov '11

27 Nov '11

commit 1a7ace59cdff83c7c00a0236e46e107b013710f0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 14:15:27 2011 +0000 Update translations for vidalia --- ar/vidalia_ar.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po index 9a07a44..28642d8 100644 --- a/ar/vidalia_ar.po +++ b/ar/vidalia_ar.po @@ -1,6 +1,7 @@ # # Translators: # IBRAHIM <mradonadiego(a)hotmail.fr>, 2011. +# <manmacdeath(a)gmail.com>, 2011. # <moazbaghdadi(a)gmail.com>, 2011. # mohammad Alhargan <malham1(a)gmail.com>, 2011. # OsamaK <osamak(a)gnu.org>, 2011. @@ -10,8 +11,8 @@ 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-11-25 17:38+0000\n" -"Last-Translator: Moazo <moazbaghdadi(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-27 14:14+0000\n" +"Last-Translator: macdeath <manmacdeath(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -159,11 +160,11 @@ msgstr "استعمل مقبس نطاق يونِكس (ControlSocket)" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "حرر ملف التوررك الحالي" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "ملحوظة: فعل هذا سيغير ملف التوررك المحمّل حاليا" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." @@ -173,7 +174,7 @@ msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." -msgstr "" +msgstr "ملف الإعدادات المحدد يحتوي على أحرف لا يستطيع نظامك إظهارها " msgctxt "AdvancedPage" msgid ""

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Nov '11

27 Nov '11

commit d476c9a19805b77b8d0a97703a0a9a1f3d82275d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 13:45:03 2011 +0000 Update translations for orbot --- values-es/strings.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 3fae0fc..6b7e4ae 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -108,10 +108,10 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="wizard_transproxy_msg">Esto permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin necesidad de realizar ninguna configuración.</string> <string name="wizard_transproxy_hint">(Si no tiene idea de lo que estamos hablando, marque esta casilla ;o)</string> <string name="wizard_transproxy_none">Ninguno</string> - <string name="pref_transparent_tethering_title">Enlazando a la red Tor, como punto de acceso</string> - <string name="pref_transparent_tethering_summary">Habilitar Tor como proxy en conexiones Wi-Fi o a traves de cable USB, cuando este dispositivo se use como punto de acceso a internet, (requiere reinicio)</string> - <string name="button_grant_superuser"></string> - <string name="pref_select_apps"></string> + <string name="pref_transparent_tethering_title">Tor, como pasarela de acceso</string> + <string name="pref_transparent_tethering_summary">Habilitar Tor como proxy cuando este dispositivo movil se utilize, a traves de conexiones WI-FI o USB como pasarela de acceso a internet</string> + <string name="button_grant_superuser">Solicitud de acceso como superusuario root</string> + <string name="pref_select_apps">Seleccion de Aplicaciones</string> <string name="pref_select_apps_summary"></string> <string name="pref_node_configuration"></string> <string name="pref_node_configuration_summary"></string>

1 0

[tor/master] Don't schedule excess_renegotiations_callback unless it's set
by nickm＠torproject.org 27 Nov '11

27 Nov '11

commit 617617e21a2d30a86cea9c8f7043333078f2e8f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 27 08:21:59 2011 -0500 Don't schedule excess_renegotiations_callback unless it's set Partial fix for bug 4587; reported by "frosty_un". --- src/common/tortls.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 0571b34..e052c85 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1318,7 +1318,8 @@ tor_tls_got_client_hello(tor_tls_t *tls) } tls->got_renegotiate = 1; - } else if (tls->server_handshake_count > 2) { + } else if (tls->server_handshake_count > 2 && + tls->excess_renegotiations_callback) { /* We got more than one renegotiation requests. The Tor protocol needs just one renegotiation; more than that probably means They are trying to DoS us and we have to stop them. We can't

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Nov '11

27 Nov '11

commit 06a14e58610f566e11c69fafe72d8b9153e6ce97 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 13:15:03 2011 +0000 Update translations for orbot --- values-es/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 8c2aa1b..3fae0fc 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -108,8 +108,8 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="wizard_transproxy_msg">Esto permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin necesidad de realizar ninguna configuración.</string> <string name="wizard_transproxy_hint">(Si no tiene idea de lo que estamos hablando, marque esta casilla ;o)</string> <string name="wizard_transproxy_none">Ninguno</string> - <string name="pref_transparent_tethering_title">Tor Tethering</string> - <string name="pref_transparent_tethering_summary"></string> + <string name="pref_transparent_tethering_title">Enlazando a la red Tor, como punto de acceso</string> + <string name="pref_transparent_tethering_summary">Habilitar Tor como proxy en conexiones Wi-Fi o a traves de cable USB, cuando este dispositivo se use como punto de acceso a internet, (requiere reinicio)</string> <string name="button_grant_superuser"></string> <string name="pref_select_apps"></string> <string name="pref_select_apps_summary"></string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Nov '11

27 Nov '11

commit 9444d6e01a0fd13ac131012878af40822a5cfc18 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 12:45:03 2011 +0000 Update translations for orbot --- values-es/strings.xml | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 0a231c1..8c2aa1b 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -95,20 +95,20 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="wizard_title_msg">Orbot activa el acceso a la red Tor, en su Android! \n\nTor le ayuda a defenderse del filtrado de contenido, análisis de tráfico y la vigilancia que amenaza su privacidad, su información confidencial y sus relaciones personales. \n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo Android.</string> <string name="wizard_warning_title">Advertencia</string> <string name="wizard_warning_msg">Simplemente instalando Orbort, no automatiza de por si, la proteccion anonima del trafico generado por su dispositivo \n\nPara anonimizar su trafico con exito, debe configurar adecuadamente Orbot, el dispositivo y las aplicaciones que utilize en su conexion.</string> - <string name="wizard_permissions_title"></string> - <string name="wizard_permissions_root_msg1"></string> - <string name="wizard_permissions_root_msg2"></string> - <string name="wizard_permissions_no_root_msg"></string> - <string name="wizard_tips_title"></string> - <string name="wizard_tips_gibberbot"></string> - <string name="gibberbot_apk_url"></string> + <string name="wizard_permissions_title">Permisos</string> + <string name="wizard_permissions_root_msg1">Si lo desea, puede conceder acceso \'superusuario\' a Orbot para habilitar las características avanzadas de configuracion y acceso a la red Tor, tales como los proxys transparentes.</string> + <string name="wizard_permissions_root_msg2">Si no desea habilitar esta opcion, por favor asegúrese de utilizar aplicaciones compatibles con Orbot</string> + <string name="wizard_permissions_no_root_msg">Su dispositivo se esta ejecutando en modo estándar, y no admite el acceso root o \"superusuario\".\n\nPara que pueda beneficiarse de todo el potencial de Tor, tendrá que utilizar aplicaciones pensadas para trabajar con Orbot, o compatibles con la configuracion proxy basada en los protocolos HTTP o SOCKS\n\n</string> + <string name="wizard_tips_title">Aplicaciones habilitadas para utilizar con Orbot</string> + <string name="wizard_tips_gibberbot">Gibberbot: Asegure su aplicación de chat con nuestro sistema de cifrado </string> + <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> - <string name="wizard_transproxy_title"></string> - <string name="wizard_transproxy_msg"></string> - <string name="wizard_transproxy_hint"></string> - <string name="wizard_transproxy_none"></string> - <string name="pref_transparent_tethering_title"></string> + <string name="wizard_transproxy_title">conexion proxy transparente activada </string> + <string name="wizard_transproxy_msg">Esto permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin necesidad de realizar ninguna configuración.</string> + <string name="wizard_transproxy_hint">(Si no tiene idea de lo que estamos hablando, marque esta casilla ;o)</string> + <string name="wizard_transproxy_none">Ninguno</string> + <string name="pref_transparent_tethering_title">Tor Tethering</string> <string name="pref_transparent_tethering_summary"></string> <string name="button_grant_superuser"></string> <string name="pref_select_apps"></string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Nov '11

27 Nov '11

commit b29885bfe24bf52adf7ebb2eca0bbba8e6696d8b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 12:15:04 2011 +0000 Update translations for orbot --- values-es/strings.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 73c1cec..0a231c1 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -11,9 +11,9 @@ <string name="status_activated">Conectado a la Red de Tor</string> <string name="status_disabled">\"Orbot está desactivado</string> <string name="status_shutting_down">Orbot se está cerrando</string> - <string name="tor_process_starting"></string> - <string name="tor_process_complete"></string> - <string name="tor_process_waiting"></string> + <string name="tor_process_starting">Lanzando cliente Tor ...</string> + <string name="tor_process_complete">Completado</string> + <string name="tor_process_waiting">En espera</string> <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Por favor, configure sus aplicaciones para usar el Proxy HTTP 127.0.0.1:8118, el SOCKS4A o el Proxy SOCKS5 127.0.0.1:9050</string> <string name="menu_home">Principal</string> <string name="menu_browse">Examinar</string> @@ -92,9 +92,9 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> - <string name="wizard_title_msg"></string> - <string name="wizard_warning_title"></string> - <string name="wizard_warning_msg"></string> + <string name="wizard_title_msg">Orbot activa el acceso a la red Tor, en su Android! \n\nTor le ayuda a defenderse del filtrado de contenido, análisis de tráfico y la vigilancia que amenaza su privacidad, su información confidencial y sus relaciones personales. \n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo Android.</string> + <string name="wizard_warning_title">Advertencia</string> + <string name="wizard_warning_msg">Simplemente instalando Orbort, no automatiza de por si, la proteccion anonima del trafico generado por su dispositivo \n\nPara anonimizar su trafico con exito, debe configurar adecuadamente Orbot, el dispositivo y las aplicaciones que utilize en su conexion.</string> <string name="wizard_permissions_title"></string> <string name="wizard_permissions_root_msg1"></string> <string name="wizard_permissions_root_msg2"></string>

1 0

[tor/release-0.2.2] unify changelog stanzas
by arma＠torproject.org 27 Nov '11

27 Nov '11

commit 5ad0de1e5d8aa4d41b37dd8e78218807607229c0 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Nov 27 03:52:24 2011 -0500 unify changelog stanzas --- ChangeLog | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 229cc7c..08fda38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,11 +9,11 @@ Changes in version 0.2.2.35 - 2011-11-?? bug 4457; workaround for Libevent versions 2.0.1-alpha through 2.0.15-stable. - If we mark an OR connection for close based on a cell we process, - don't process any further cells on it. We already avoided reading - on marked-for-close connections, but now we also discard the cells - we'd already read. Fixes bug 4299; bugfix on 0.2.0.10-alpha, which - was the first version where we might mark a connection for close - based on processing a cell on it. + don't process any further cells on it. We already avoid further + reads on marked-for-close connections, but now we also discard the + cells we'd already read. Fixes bug 4299; bugfix on 0.2.0.10-alpha, + which was the first version where we might mark a connection for + close based on processing a cell on it. - Correctly sanity-check that we don't underflow on a memory allocation (and then assert) for hidden service introduction point decryption. Bug discovered by Dan Rosenberg. Fixes bug 4410; @@ -26,9 +26,9 @@ Changes in version 0.2.2.35 - 2011-11-?? we've had in the 0.2.3.x branch already. - When running as a client, do not print a misleading (and plain wrong) log message that we're collecting "directory request" - statistics: we don't collect statistics as clients. Also don't - create a useless (because empty) stats file in the stats/ - directory. Fixes bug 4353; bugfix on 0.2.2.34. + statistics: clients don't collect statistics. Also don't create a + useless (because empty) stats file in the stats/ directory. Fixes + bug 4353; bugfix on 0.2.2.34. o Minor bugfixes: - Detect failure to initialize Libevent. This fix provides better @@ -36,7 +36,7 @@ Changes in version 0.2.2.35 - 2011-11-?? - Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers function. This was eating up hideously large amounts of time on some busy servers. Fixes bug 4518; bugfix on 0.0.9.8. - - Resolve an integer overflow bug in smartlist_ensure_capacity. + - Resolve an integer overflow bug in smartlist_ensure_capacity(). Fixes bug 4230; bugfix on Tor 0.1.0.1-rc. Based on a patch by Mansour Moufid. - Don't warn about unused log_mutex in log.c when building with @@ -44,11 +44,11 @@ Changes in version 0.2.2.35 - 2011-11-?? 0.1.0.6-rc which introduced --disable-threads. - When configuring, starting, or stopping an NT service, stop immediately after the service configuration attempt has succeeded - or failed. Fixes bug3963; bugfix on 0.2.0.7-alpha. + or failed. Fixes bug 3963; bugfix on 0.2.0.7-alpha. - 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. - - Fixed a typo in a hibernation-related log message. Fixes bug 4331; + - Fix a typo in a hibernation-related log message. Fixes bug 4331; bugfix on 0.2.2.23-alpha; found by "tmpname0901". - Fix a memory leak in launch_direct_bridge_descriptor_fetch() that occurred when a client tried to fetch a descriptor for a bridge

1 0

[tor/release-0.2.2] fold in one more
by arma＠torproject.org 27 Nov '11

27 Nov '11

commit 52789c863e78bcb3d3c9072efe7ffc188337cb1c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Nov 27 03:35:15 2011 -0500 fold in one more --- ChangeLog | 3 +++ changes/bug4230 | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2096215..229cc7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,9 @@ Changes in version 0.2.2.35 - 2011-11-?? - Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers function. This was eating up hideously large amounts of time on some busy servers. Fixes bug 4518; bugfix on 0.0.9.8. + - Resolve an integer overflow bug in smartlist_ensure_capacity. + Fixes bug 4230; bugfix on Tor 0.1.0.1-rc. Based on a patch by + Mansour Moufid. - Don't warn about unused log_mutex in log.c when building with --disable-threads using a recent GCC. Fixes bug 4437; bugfix on 0.1.0.6-rc which introduced --disable-threads. diff --git a/changes/bug4230 b/changes/bug4230 deleted file mode 100644 index c1ba584..0000000 --- a/changes/bug4230 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Resolve an integer overflow bug in smartlist_ensure_capacity. - Fixes bug 4230; bugfix on Tor 0.1.0.1-rc. Based on a patch by - Mansour Moufid. -

1 0

[tor/release-0.2.2] Fix a compile warning on 64bit OS X
by arma＠torproject.org 27 Nov '11

27 Nov '11

commit 841247a5864064ce031988ca2dab5808b11408b2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 01:41:37 2011 +0100 Fix a compile warning on 64bit OS X Backport of 68475fc5c5a806ebbb5657de1667dab2c3e09b7c which accidentally only made it into master. Fixes bug 4547. Bug isn't in any released version. --- src/or/dirserv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 19d9702..634b3ec 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1909,7 +1909,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl) * of Fast nodes. */ if (options->AuthDirFastGuarantee && fast_bandwidth > options->AuthDirFastGuarantee) - fast_bandwidth = options->AuthDirFastGuarantee; + fast_bandwidth = (uint32_t)options->AuthDirFastGuarantee; /* Now that we have a time-known that 7/8 routers are known longer than, * fill wfus with the wfu of every such "familiar" router. */

1 0

[tor/release-0.2.2] Correct the handling of overflow behavior in smartlist_ensure_capacity
by arma＠torproject.org 27 Nov '11

27 Nov '11

commit e1c6431e42bc6b5619c78008cbe92730ead57bbf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 9 12:08:28 2011 -0500 Correct the handling of overflow behavior in smartlist_ensure_capacity The old behavior was susceptible to the compiler optimizing out our assertion check, *and* could still overflow size_t on 32-bit systems even when it did work. --- changes/bug4230 | 5 +++++ src/common/container.c | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/changes/bug4230 b/changes/bug4230 new file mode 100644 index 0000000..c1ba584 --- /dev/null +++ b/changes/bug4230 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Resolve an integer overflow bug in smartlist_ensure_capacity. + Fixes bug 4230; bugfix on Tor 0.1.0.1-rc. Based on a patch by + Mansour Moufid. + diff --git a/src/common/container.c b/src/common/container.c index c741eb0..edfcd97 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -61,13 +61,22 @@ smartlist_clear(smartlist_t *sl) static INLINE void smartlist_ensure_capacity(smartlist_t *sl, int size) { +#if SIZEOF_SIZE_T > SIZEOF_INT +#define MAX_CAPACITY (INT_MAX) +#else +#define MAX_CAPACITY (int)((SIZE_MAX / (sizeof(void*)))) +#endif if (size > sl->capacity) { - int higher = sl->capacity * 2; - while (size > higher) - higher *= 2; - tor_assert(higher > 0); /* detect overflow */ + int higher = sl->capacity; + if (PREDICT_UNLIKELY(size > MAX_CAPACITY/2)) { + tor_assert(size <= MAX_CAPACITY); + higher = MAX_CAPACITY; + } else { + while (size > higher) + higher *= 2; + } sl->capacity = higher; - sl->list = tor_realloc(sl->list, sizeof(void*)*sl->capacity); + sl->list = tor_realloc(sl->list, sizeof(void*)*((size_t)sl->capacity)); } }

1 0