July 2014 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] circuit_build_failed: distinguish "first hop chan failed", "CREATE failed"
by arma＠torproject.org 25 Jul '14

25 Jul '14

commit d5558f00729992a9abeeb1cb1512004de35ec007 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 31 16:53:31 2013 -0400 circuit_build_failed: distinguish "first hop chan failed", "CREATE failed" Roger spotted this on tor-dev in his comments on proposal 221. (Actually, detect DESTROY vs everything else, since arma likes network timeout indicating failure but not overload indicating failure.) --- src/or/circuituse.c | 9 +++++---- src/or/command.c | 1 + src/or/or.h | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index c2d2b2e..06a51a0 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1382,10 +1382,11 @@ circuit_build_failed(origin_circuit_t *circ) failed_at_last_hop = 1; } if (circ->cpath && - circ->cpath->state != CPATH_STATE_OPEN) { - /* We failed at the first hop. If there's an OR connection - * to blame, blame it. Also, avoid this relay for a while, and - * fail any one-hop directory fetches destined for it. */ + circ->cpath->state != CPATH_STATE_OPEN && + ! circ->base_.received_destroy) { + /* We failed at the first hop for some reason other than a DESTROY cell. + * If there's an OR connection to blame, blame it. Also, avoid this relay + * for a while, and fail any one-hop directory fetches destined for it. */ const char *n_chan_id = circ->cpath->extend_info->identity_digest; int already_marked = 0; if (circ->base_.n_chan) { diff --git a/src/or/command.c b/src/or/command.c index 699b02f..51d07b0 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -499,6 +499,7 @@ command_process_destroy_cell(cell_t *cell, channel_t *chan) log_debug(LD_OR,"Received for circID %u.",(unsigned)cell->circ_id); reason = (uint8_t)cell->payload[0]; + circ->received_destroy = 1; if (!CIRCUIT_IS_ORIGIN(circ) && cell->circ_id == TO_OR_CIRCUIT(circ)->p_circ_id) { diff --git a/src/or/or.h b/src/or/or.h index 3eaf344..34f055c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2785,6 +2785,9 @@ typedef struct circuit_t { * allowing n_streams to add any more cells. (OR circuit only.) */ unsigned int streams_blocked_on_p_chan : 1; + /** True iff this circuit has received a DESTROY cell in either direction */ + unsigned int received_destroy : 1; + uint8_t state; /**< Current status of this circuit. */ uint8_t purpose; /**< Why are we creating this circuit? */

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit 5cf8202415081b68d7acbda77d20101a3603993e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 15:45:39 2014 +0000 Update translations for tor-launcher-network-settings_completed --- it/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/network-settings.dtd b/it/network-settings.dtd index 09b068f..084c264 100644 --- a/it/network-settings.dtd +++ b/it/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "In attesa di avviare Tor..."> -<!ENTITY torsettings.restart "Riavvia"> +<!ENTITY torsettings.restartTor "Riavvia Tor"> <!ENTITY torsettings.optional "Facoltativo">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit 61a8bfbf018041ae5bb2b9796ca06e6cd7d2157d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 15:45:36 2014 +0000 Update translations for tor-launcher-network-settings --- it/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/network-settings.dtd b/it/network-settings.dtd index 7cece0e..084c264 100644 --- a/it/network-settings.dtd +++ b/it/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "In attesa di avviare Tor..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Riavvia Tor"> <!ENTITY torsettings.optional "Facoltativo">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit 8b3d84d054c5163f75773e90386b015a16fb3d51 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 15:45:32 2014 +0000 Update translations for tor-launcher-properties_completed --- it/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/it/torlauncher.properties b/it/torlauncher.properties index cd514cf..731ced4 100644 --- a/it/torlauncher.properties +++ b/it/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Avviatore di Tor torlauncher.tor_exited=Tor si è arrestato inaspettatamente. -torlauncher.please_restart_app=Per favore riavvia questa applicazione. +torlauncher.tor_connection_lost=La tua connesione alla rete Tor è stata persa. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor. torlauncher.tor_control_failed=Impossibile ottenere il controllo di Tor. @@ -30,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il torlauncher.recommended_bridge=(raccomandato) torlauncher.connect=Connetti +torlauncher.reconnect=Riconnettiti torlauncher.quit=Esci torlauncher.quit_win=Esci torlauncher.done=Fatto

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit c54bf1bfcac78f951b770dc2dbafbe46b8259e40 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 15:45:29 2014 +0000 Update translations for tor-launcher-properties --- it/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/torlauncher.properties b/it/torlauncher.properties index 72cef12..731ced4 100644 --- a/it/torlauncher.properties +++ b/it/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Avviatore di Tor torlauncher.tor_exited=Tor si è arrestato inaspettatamente. -torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_connection_lost=La tua connesione alla rete Tor è stata persa. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor. torlauncher.tor_control_failed=Impossibile ottenere il controllo di Tor. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il torlauncher.recommended_bridge=(raccomandato) torlauncher.connect=Connetti -torlauncher.reconnect=Reconnect +torlauncher.reconnect=Riconnettiti torlauncher.quit=Esci torlauncher.quit_win=Esci torlauncher.done=Fatto

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit 7029f07158696e517521d3f773aa82cba4a6c7d3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 15:15:40 2014 +0000 Update translations for tor-launcher-network-settings_completed --- es/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 2bce6c5..dd1d82d 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Esperando a que Tor arranque..."> -<!ENTITY torsettings.restart "Reiniciar"> +<!ENTITY torsettings.restartTor "Reiniciar Tor"> <!ENTITY torsettings.optional "Opcional">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit bc2b3f87011c4c16ccbda6f4aabf26eac997a5a7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 15:15:38 2014 +0000 Update translations for tor-launcher-network-settings --- es/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 24760dc..dd1d82d 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Esperando a que Tor arranque..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Reiniciar Tor"> <!ENTITY torsettings.optional "Opcional">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit 29c93c4e63400f53d618db35590d4d162b71a09f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 15:15:32 2014 +0000 Update translations for tor-launcher-properties_completed --- es/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index c968541..7edc87e 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited=Tor se cerró inesperadamente. -torlauncher.please_restart_app=Por favor reinicie esta aplicación. +torlauncher.tor_connection_lost=Se ha perdido su conexión a la red Tor. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_control_failed=Fallo al tomar control de Tor. @@ -30,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=No hay disponible ningún repetidor pu torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar +torlauncher.reconnect=Reconectar torlauncher.quit=Salir torlauncher.quit_win=Salir torlauncher.done=Listo

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit 011885e108046705347be7ff9f51e298cf968ce7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 15:15:30 2014 +0000 Update translations for tor-launcher-properties --- es/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index 0a2f4ba..7edc87e 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited=Tor se cerró inesperadamente. -torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_connection_lost=Se ha perdido su conexión a la red Tor. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_control_failed=Fallo al tomar control de Tor. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=No hay disponible ningún repetidor pu torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar -torlauncher.reconnect=Reconnect +torlauncher.reconnect=Reconectar torlauncher.quit=Salir torlauncher.quit_win=Salir torlauncher.done=Listo

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 25 Jul '14

25 Jul '14

commit 80128752cf6540c636b4bdaa5eefed30352f2656 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 25 14:45:39 2014 +0000 Update translations for tor-launcher-network-settings_completed --- pt_BR/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd index 562c0fb..254e1cc 100644 --- a/pt_BR/network-settings.dtd +++ b/pt_BR/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Esperando que Tor inicie..."> -<!ENTITY torsettings.restart "Reiniciar"> +<!ENTITY torsettings.restartTor "Reiniciar o Tor"> <!ENTITY torsettings.optional "Opcional">

1 0