January 2013 - tor-commits - lists.torproject.org

[tor/master] Check for nacl headers in nacl/ subdir
by nickm＠torproject.org 16 Jan '13

16 Jan '13

commit b987081941bda22e5e37a09c75ffc790c270624b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 10:29:11 2013 -0500 Check for nacl headers in nacl/ subdir Fix for bug 7972 --- changes/bug7972 | 3 +++ configure.ac | 7 +++++++ src/common/crypto_curve25519.c | 4 ++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/changes/bug7972 b/changes/bug7972 new file mode 100644 index 0000000..b751ced --- /dev/null +++ b/changes/bug7972 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Detect nacl when its headers are in a nacl/ subdirectory. Fixes bug + 7972; bugfix on 0.2.4.8-alpha. diff --git a/configure.ac b/configure.ac index acd2083..f047ab9 100644 --- a/configure.ac +++ b/configure.ac @@ -689,13 +689,20 @@ if test x$enable_curve25519 != xno; then [tor_cv_can_use_curve25519_donna_c64=cross], [tor_cv_can_use_curve25519_donna_c64=no])])]) + AC_CHECK_HEADERS([crypto_scalarmult_curve25519.h \ + nacl/crypto_scalarmult_curve25519.h]) + AC_CACHE_CHECK([whether we can use curve25519 from nacl], tor_cv_can_use_curve25519_nacl, [tor_saved_LIBS="$LIBS" LIBS="$LIBS -lnacl" AC_LINK_IFELSE( [AC_LANG_PROGRAM([dnl + #ifdef HAVE_CRYPTO_SCALARMULT_CURVE25519_H #include <crypto_scalarmult_curve25519.h> + #elif defined(HAVE_NACL_CRYPTO_SCALARMULT_CURVE25519_H) + #include <nacl/crypto_scalarmult_curve25519.h> + #endif #ifdef crypto_scalarmult_curve25519_ref_BYTES #error Hey, this is the reference implementation! #endif diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 5636fe6..8870542 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -22,7 +22,11 @@ int curve25519_donna(uint8_t *mypublic, const uint8_t *secret, const uint8_t *basepoint); #endif #ifdef USE_CURVE25519_NACL +#ifdef HAVE_CRYPTO_SCALARMULT_CURVE25519_H #include <crypto_scalarmult_curve25519.h> +#elif defined(HAVE_NACL_CRYPTO_SCALARMULT_CURVE25519_H) +#include <nacl/crypto_scalarmult_curve25519.h> +#endif #endif int

1 0

[tor/master] Actually link against nacl when we want to use it
by nickm＠torproject.org 16 Jan '13

16 Jan '13

commit 50f527a2c9202105a84e5f6c7d2844c494a46b7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 13:07:52 2013 -0500 Actually link against nacl when we want to use it Fixes more of bug 7972 --- changes/bug7972 | 2 ++ src/or/include.am | 2 +- src/test/include.am | 6 +++--- src/tools/include.am | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/changes/bug7972 b/changes/bug7972 index b751ced..6e1fce6 100644 --- a/changes/bug7972 +++ b/changes/bug7972 @@ -1,3 +1,5 @@ o Minor bugfixes: - Detect nacl when its headers are in a nacl/ subdirectory. Fixes bug 7972; bugfix on 0.2.4.8-alpha. + - Actually link against nacl when we're configured to use it. Fixes bug + 7972; bugfix on 0.2.4.8-alpha. diff --git a/src/or/include.am b/src/or/include.am index 08a27e1..2410154 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -99,7 +99,7 @@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \ src/common/libor-crypto.a $(LIBDONNA) \ src/common/libor-event.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ ORHEADERS = \ src/or/addressmap.h \ diff --git a/src/test/include.am b/src/test/include.am index f625ab7..112d1a7 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -40,7 +40,7 @@ src_test_test_LDADD = src/or/libtor.a src/common/libor.a \ src/common/libor-crypto.a $(LIBDONNA) \ src/common/libor-event.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ @@ -48,7 +48,7 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \ src/common/libor-crypto.a $(LIBDONNA) \ src/common/libor-event.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ noinst_HEADERS+= \ src/test/test.h @@ -60,7 +60,7 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ src/common/libor-crypto.a $(LIBDONNA) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ -I"$(top_srcdir)/src/or" diff --git a/src/tools/include.am b/src/tools/include.am index 610864f..54b150a 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -10,14 +10,14 @@ src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \ $(LIBDONNA) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_tools_tor_checkkey_SOURCES = src/tools/tor-checkkey.c src_tools_tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_checkkey_LDADD = src/common/libor.a src/common/libor-crypto.a \ $(LIBDONNA) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ include src/tools/tor-fw-helper/include.am

1 0

[tor/master] Merge branch 'bug7972'
by nickm＠torproject.org 16 Jan '13

16 Jan '13

commit 65e6e68981d9910c5f78f2cfed6c59cbee1494c7 Merge: 7fc91dc 50f527a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 13:56:10 2013 -0500 Merge branch 'bug7972' changes/bug7972 | 5 +++++ configure.ac | 7 +++++++ src/common/crypto_curve25519.c | 4 ++++ src/or/include.am | 2 +- src/test/include.am | 6 +++--- src/tools/include.am | 4 ++-- 6 files changed, 22 insertions(+), 6 deletions(-)

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit f84f3fc686585043926f084dd745db0e269cd9bc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 18:46:05 2013 +0000 Update translations for torbirdy_completed --- es/torbirdy.properties | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/torbirdy.properties b/es/torbirdy.properties index 0ae40c4..03d9b26 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -1,9 +1,9 @@ torbirdy.name=TorBirdy -torbirdy.enabled.tor=TorBirdy habilitado: Tor -torbirdy.enabled.jondo=TorBirdy habilitado: JonDo -torbirdy.enabled.custom=TorBirdy habilitado: Proxy personalizado -torbirdy.enabled.torification=TorBirdy habilitado: Torificación transparente +torbirdy.enabled.tor=TorBirdy habilitado: usando Tor +torbirdy.enabled.jondo=TorBirdy habilitado: usando JonDo +torbirdy.enabled.custom=TorBirdy habilitado: usando proxy personalizado +torbirdy.enabled.torification=TorBirdy habilitado: usando torificación transparente torbirdy.disabled=TorBirdy: ¡Deshabilitado! torbirdy.email.prompt=TorBirdy ha deshabilitado el asistente de auto-configuración de Thunderbird para proteger tu anonimato.⏎ ⏎ Han sido establecidos los parámetros recomendados de seguridad para %S.⏎ ⏎ Puedes configurar el resto de parámetros de la cuenta manualmente.

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 6031e00ab4b6bc304a51bef336a47c31cb62a272 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 18:46:03 2013 +0000 Update translations for torbirdy --- es/torbirdy.properties | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/torbirdy.properties b/es/torbirdy.properties index 0ae40c4..03d9b26 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -1,9 +1,9 @@ torbirdy.name=TorBirdy -torbirdy.enabled.tor=TorBirdy habilitado: Tor -torbirdy.enabled.jondo=TorBirdy habilitado: JonDo -torbirdy.enabled.custom=TorBirdy habilitado: Proxy personalizado -torbirdy.enabled.torification=TorBirdy habilitado: Torificación transparente +torbirdy.enabled.tor=TorBirdy habilitado: usando Tor +torbirdy.enabled.jondo=TorBirdy habilitado: usando JonDo +torbirdy.enabled.custom=TorBirdy habilitado: usando proxy personalizado +torbirdy.enabled.torification=TorBirdy habilitado: usando torificación transparente torbirdy.disabled=TorBirdy: ¡Deshabilitado! torbirdy.email.prompt=TorBirdy ha deshabilitado el asistente de auto-configuración de Thunderbird para proteger tu anonimato.⏎ ⏎ Han sido establecidos los parámetros recomendados de seguridad para %S.⏎ ⏎ Puedes configurar el resto de parámetros de la cuenta manualmente.

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit cef01768387c337612b4f75eb0e235834e4c2364 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 18:16:06 2013 +0000 Update translations for torbirdy_completed --- es/torbirdy.dtd | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 3955323..ca241ee 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -16,14 +16,14 @@ <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> <!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> -<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración para proxy recomendada con TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración de proxy recomendada para TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Escoger un servicio de anonimización"> <!ENTITY torbirdy.prefs.anonservice.key "a"> <!ENTITY torbirdy.prefs.customsettings.text "Usar una configuración para proxy personalizada"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "Servidor SOCKS:"> -<!ENTITY torbirdy.prefs.socks_host.key "d"> +<!ENTITY torbirdy.prefs.socks_host.key "s"> <!ENTITY torbirdy.prefs.socks_port.label "Puerto:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> <!ENTITY torbirdy.prefs.torification.label "Torificación transparente (sin configurar las aplicaciones)"> @@ -31,14 +31,14 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Habilitar soporte de push email para cuentas IMAP [por defecto: deshabilitado]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Al iniciar seleccionar la última carpeta de correo utilizado [por defecto: deshabilitado, se seleccionará Carpetas Locales]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Seleccionar la última carpeta de correo utilizado al iniciar [por defecto: deshabilitado, se seleccionará Carpetas Locales]"> <!ENTITY torbirdy.prefs.startup_folder.key "u"> <!ENTITY torbirdy.prefs.timezone.label "No establecer la zona horaria de Thunderbird a UTC [por defecto: establecer a UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Incluír las claves de identificación del receptor en los mensajes cifrados [por defecto: habilitado]"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "c"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.account_specific "Configuración específica de la cuenta"> -<!ENTITY torbirdy.prefs.select_account.key "E"> +<!ENTITY torbirdy.prefs.select_account.key "c"> <!ENTITY torbirdy.prefs.select_account.label "Elegir una cuenta"> <!ENTITY torbirdy.panel.usetor.label "Usar router onion de Tor">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 680bb0a87c23d0a55caa18bbb09929e885debf65 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 18:16:03 2013 +0000 Update translations for torbirdy --- es/torbirdy.dtd | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 3955323..ca241ee 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -16,14 +16,14 @@ <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> <!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> -<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración para proxy recomendada con TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración de proxy recomendada para TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Escoger un servicio de anonimización"> <!ENTITY torbirdy.prefs.anonservice.key "a"> <!ENTITY torbirdy.prefs.customsettings.text "Usar una configuración para proxy personalizada"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "Servidor SOCKS:"> -<!ENTITY torbirdy.prefs.socks_host.key "d"> +<!ENTITY torbirdy.prefs.socks_host.key "s"> <!ENTITY torbirdy.prefs.socks_port.label "Puerto:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> <!ENTITY torbirdy.prefs.torification.label "Torificación transparente (sin configurar las aplicaciones)"> @@ -31,14 +31,14 @@ <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Habilitar soporte de push email para cuentas IMAP [por defecto: deshabilitado]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Al iniciar seleccionar la última carpeta de correo utilizado [por defecto: deshabilitado, se seleccionará Carpetas Locales]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Seleccionar la última carpeta de correo utilizado al iniciar [por defecto: deshabilitado, se seleccionará Carpetas Locales]"> <!ENTITY torbirdy.prefs.startup_folder.key "u"> <!ENTITY torbirdy.prefs.timezone.label "No establecer la zona horaria de Thunderbird a UTC [por defecto: establecer a UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Incluír las claves de identificación del receptor en los mensajes cifrados [por defecto: habilitado]"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "c"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.account_specific "Configuración específica de la cuenta"> -<!ENTITY torbirdy.prefs.select_account.key "E"> +<!ENTITY torbirdy.prefs.select_account.key "c"> <!ENTITY torbirdy.prefs.select_account.label "Elegir una cuenta"> <!ENTITY torbirdy.panel.usetor.label "Usar router onion de Tor">

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit d8266e4ef216b97f5ef33e90c3caa3b04a20d51d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 17:46:07 2013 +0000 Update translations for torbirdy_completed --- es/torbirdy.dtd | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 5127a95..3955323 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> <!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> -<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración para proxy recomendada para TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración para proxy recomendada con TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Escoger un servicio de anonimización"> <!ENTITY torbirdy.prefs.anonservice.key "a"> @@ -26,19 +26,19 @@ <!ENTITY torbirdy.prefs.socks_host.key "d"> <!ENTITY torbirdy.prefs.socks_port.label "Puerto:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> -<!ENTITY torbirdy.prefs.torification.label "Torificación transparente"> +<!ENTITY torbirdy.prefs.torification.label "Torificación transparente (sin configurar las aplicaciones)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Global"> -<!ENTITY torbirdy.prefs.imap.label "Habilitar el soporte push email para cuentas IMAP [por defecto: deshabilitado]"> -<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.imap.label "Habilitar soporte de push email para cuentas IMAP [por defecto: deshabilitado]"> +<!ENTITY torbirdy.prefs.imap.key "p"> <!ENTITY torbirdy.prefs.startup_folder.label "Al iniciar seleccionar la última carpeta de correo utilizado [por defecto: deshabilitado, se seleccionará Carpetas Locales]"> -<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.startup_folder.key "u"> <!ENTITY torbirdy.prefs.timezone.label "No establecer la zona horaria de Thunderbird a UTC [por defecto: establecer a UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Incluír las claves de identificación del receptor en los mensajes cifrados [por defecto: habilitado]"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "c"> <!ENTITY torbirdy.prefs.account_specific "Configuración específica de la cuenta"> -<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.key "E"> <!ENTITY torbirdy.prefs.select_account.label "Elegir una cuenta"> <!ENTITY torbirdy.panel.usetor.label "Usar router onion de Tor">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 9a5d7e7be731ef64bdd95d0d23a8f9220759bf8c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 17:46:04 2013 +0000 Update translations for torbirdy --- es/torbirdy.dtd | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 5127a95..3955323 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> <!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> -<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración para proxy recomendada para TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Usar la configuración para proxy recomendada con TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Escoger un servicio de anonimización"> <!ENTITY torbirdy.prefs.anonservice.key "a"> @@ -26,19 +26,19 @@ <!ENTITY torbirdy.prefs.socks_host.key "d"> <!ENTITY torbirdy.prefs.socks_port.label "Puerto:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> -<!ENTITY torbirdy.prefs.torification.label "Torificación transparente"> +<!ENTITY torbirdy.prefs.torification.label "Torificación transparente (sin configurar las aplicaciones)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Global"> -<!ENTITY torbirdy.prefs.imap.label "Habilitar el soporte push email para cuentas IMAP [por defecto: deshabilitado]"> -<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.imap.label "Habilitar soporte de push email para cuentas IMAP [por defecto: deshabilitado]"> +<!ENTITY torbirdy.prefs.imap.key "p"> <!ENTITY torbirdy.prefs.startup_folder.label "Al iniciar seleccionar la última carpeta de correo utilizado [por defecto: deshabilitado, se seleccionará Carpetas Locales]"> -<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.startup_folder.key "u"> <!ENTITY torbirdy.prefs.timezone.label "No establecer la zona horaria de Thunderbird a UTC [por defecto: establecer a UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Incluír las claves de identificación del receptor en los mensajes cifrados [por defecto: habilitado]"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "c"> <!ENTITY torbirdy.prefs.account_specific "Configuración específica de la cuenta"> -<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.key "E"> <!ENTITY torbirdy.prefs.select_account.label "Elegir una cuenta"> <!ENTITY torbirdy.panel.usetor.label "Usar router onion de Tor">

1 0

[stem/master] Dropping expect_alive arg from _notify_status_listeners
by atagar＠torproject.org 16 Jan '13

16 Jan '13

commit f09e5efc22264c8c83bd39b9ae679f3f6beeb752 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 14 08:34:37 2013 -0800 Dropping expect_alive arg from _notify_status_listeners On reflection the expect_alive attribute can be implied by the state. Simplifying things. --- stem/control.py | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/stem/control.py b/stem/control.py index 2090983..5649b59 100644 --- a/stem/control.py +++ b/stem/control.py @@ -454,7 +454,7 @@ class BaseController(object): def _connect(self): self._launch_threads() - self._notify_status_listeners(State.INIT, True) + self._notify_status_listeners(State.INIT) self._socket_connect() def _close(self): @@ -470,7 +470,7 @@ class BaseController(object): if t and t.isAlive() and threading.currentThread() != t: t.join() - self._notify_status_listeners(State.CLOSED, False) + self._notify_status_listeners(State.CLOSED) self._socket_close() def _post_authentication(self): @@ -478,23 +478,11 @@ class BaseController(object): pass - def _notify_status_listeners(self, state, expect_alive = None): + def _notify_status_listeners(self, state): """ Informs our status listeners that a state change occurred. - States imply that our socket is either alive or not, which may not hold - true when multiple events occur in quick succession. For instance, a - sighup could cause two events (**State.RESET** for the sighup and - **State.CLOSE** if it causes tor to crash). However, there's no guarantee - of the order in which they occur, and it would be bad if listeners got the - **State.RESET** last, implying that we were alive. - - If set, the expect_alive flag will discard our event if it conflicts with - our current :func:`~stem.control.BaseController.is_alive` state. - :param stem.control.State state: state change that has occurred - :param bool expect_alive: discard event if it conflicts with our - :func:`~stem.control.BaseController.is_alive` state """ # Any changes to our is_alive() state happen under the send lock, so we @@ -503,6 +491,20 @@ class BaseController(object): # TODO: when we drop python 2.5 compatibility we can simplify this with self._socket._get_send_lock(): with self._status_listeners_lock: + # States imply that our socket is either alive or not, which may not + # hold true when multiple events occur in quick succession. For + # instance, a sighup could cause two events (State.RESET for the sighup + # and State.CLOSE if it causes tor to crash). However, there's no + # guarantee of the order in which they occur, and it would be bad if + # listeners got the State.RESET last, implying that we were alive. + + expect_alive = None + + if state in (State.INIT, State.RESET): + expect_alive = True + elif state == State.CLOSED: + expect_alive = False + change_timestamp = time.time() if expect_alive is not None and expect_alive != self.is_alive():

1 0