November 2012 - tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 432d88ab85d7995ff65c927d403940205f62545b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 13:45:20 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 867bcd2..25638d3 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 12:05+0000\n" +"PO-Revision-Date: 2012-11-10 13:43+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -336,7 +336,7 @@ msgstr "Gráfico de Ancho de Banda " msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Iniciando la solicitud de bridge HTTPS (puente a Tor no propagado)... " +msgstr "Iniciando solicitud HTTPS de bridge (puente a Tor no propagado)... " msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -344,15 +344,15 @@ msgstr "Conectando a %1:%2... " msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Enviando una solicitud HTTPS de bridges (puentes a Tor no propagados)... " +msgstr "Enviando una solicitud de bridges por HTTPS... " msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." -msgstr "Descargando una lista de bridges (puentes a Tor no propagados)... " +msgstr "Descargando una lista de bridges... " msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "Descargando bridges " +msgstr "Descargando Bridges (puentes a Tor no propagados) " msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1"

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 00005586dad9da20124d008c9960b10090475679 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 12:15:25 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 1d44908..867bcd2 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 11:42+0000\n" +"PO-Revision-Date: 2012-11-10 12:05+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -150,7 +150,7 @@ msgstr "Usar conexión TCP (ControlPort) " msgctxt "AdvancedPage" msgid "Path:" -msgstr "Ruta de acceso: " +msgstr "Ruta: " msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" @@ -172,13 +172,13 @@ 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 "La ubicación especificada del el archivo de configuración de Tor (torrc) contiene caracteres que no se pueden representar en la actual codificación de caracteres de 8 bits de su sistema. " +msgstr "La ubicación especificada para el archivo de configuración de Tor (torrc) contiene caracteres que no se pueden representar en la actual codificación de caracteres de 8 bits de su sistema. " msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." -msgstr "La ubicación especificada de la carpeta de datos de Tor contiene caracteres que no se puede representar en la actual codificación de caracteres de 8 bits de su sistema. " +msgstr "La ubicación especificada para la carpeta de datos de Tor contiene caracteres que no se puede representar en la actual codificación de caracteres de 8 bits de su sistema. " msgctxt "AdvancedPage" msgid "Warning" @@ -235,7 +235,7 @@ msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." -msgstr "Vidalia no fue capaz de eliminar el servicio de Tor. \n \nPuede que necesite eliminarlo de manera manual. " +msgstr "Vidalia no fue capaz de eliminar el servicio de Tor. \n \nPuede que sea necesario eliminarlo de manera manual. " msgctxt "AdvancedPage" msgid "Select a Directory to Use for Panic" @@ -247,7 +247,7 @@ msgstr "Idioma " msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" -msgstr "Seleccione el idioma usado por Vidalia " +msgstr "Seleccione el idioma a utilizar en Vidalia " msgctxt "AppearancePage" msgid "Style" @@ -304,7 +304,7 @@ msgstr "Tasa de Envío " msgctxt "BandwidthGraph" msgid "Always on Top" -msgstr "Siempre Arriba " +msgstr "Siempre Encima " msgctxt "BandwidthGraph" msgid "Style" @@ -324,11 +324,11 @@ msgstr "% Opaco" msgctxt "BandwidthGraph" msgid "Save" -msgstr "Guardar" +msgstr "Guardar " msgctxt "BandwidthGraph" msgid "Cancel" -msgstr "Cancelar" +msgstr "Cancelar " msgctxt "BandwidthGraph" msgid "Bandwidth Graph" @@ -352,15 +352,15 @@ msgstr "Descargando una lista de bridges (puentes a Tor no propagados)... " msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "Descargando bridges (puentes a Tor no propagados)" +msgstr "Descargando bridges " msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "No se pudo descargar bridges (puentes a Tor no propagados): %1" +msgstr "No se pudo descargar bridges: %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "Reintentando la solicitud de bridge (puente a Tor no propagados)... " +msgstr "Reintentando la solicitud de bridge... " msgctxt "BridgeUsageDialog" msgid "Country"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit f1dbfee8947bc3fdfedfa30a721a4b293186e478 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 12:15:23 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 1d44908..867bcd2 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 11:42+0000\n" +"PO-Revision-Date: 2012-11-10 12:05+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -150,7 +150,7 @@ msgstr "Usar conexión TCP (ControlPort) " msgctxt "AdvancedPage" msgid "Path:" -msgstr "Ruta de acceso: " +msgstr "Ruta: " msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" @@ -172,13 +172,13 @@ 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 "La ubicación especificada del el archivo de configuración de Tor (torrc) contiene caracteres que no se pueden representar en la actual codificación de caracteres de 8 bits de su sistema. " +msgstr "La ubicación especificada para el archivo de configuración de Tor (torrc) contiene caracteres que no se pueden representar en la actual codificación de caracteres de 8 bits de su sistema. " msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." -msgstr "La ubicación especificada de la carpeta de datos de Tor contiene caracteres que no se puede representar en la actual codificación de caracteres de 8 bits de su sistema. " +msgstr "La ubicación especificada para la carpeta de datos de Tor contiene caracteres que no se puede representar en la actual codificación de caracteres de 8 bits de su sistema. " msgctxt "AdvancedPage" msgid "Warning" @@ -235,7 +235,7 @@ msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." -msgstr "Vidalia no fue capaz de eliminar el servicio de Tor. \n \nPuede que necesite eliminarlo de manera manual. " +msgstr "Vidalia no fue capaz de eliminar el servicio de Tor. \n \nPuede que sea necesario eliminarlo de manera manual. " msgctxt "AdvancedPage" msgid "Select a Directory to Use for Panic" @@ -247,7 +247,7 @@ msgstr "Idioma " msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" -msgstr "Seleccione el idioma usado por Vidalia " +msgstr "Seleccione el idioma a utilizar en Vidalia " msgctxt "AppearancePage" msgid "Style" @@ -304,7 +304,7 @@ msgstr "Tasa de Envío " msgctxt "BandwidthGraph" msgid "Always on Top" -msgstr "Siempre Arriba " +msgstr "Siempre Encima " msgctxt "BandwidthGraph" msgid "Style" @@ -324,11 +324,11 @@ msgstr "% Opaco" msgctxt "BandwidthGraph" msgid "Save" -msgstr "Guardar" +msgstr "Guardar " msgctxt "BandwidthGraph" msgid "Cancel" -msgstr "Cancelar" +msgstr "Cancelar " msgctxt "BandwidthGraph" msgid "Bandwidth Graph" @@ -352,15 +352,15 @@ msgstr "Descargando una lista de bridges (puentes a Tor no propagados)... " msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "Descargando bridges (puentes a Tor no propagados)" +msgstr "Descargando bridges " msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "No se pudo descargar bridges (puentes a Tor no propagados): %1" +msgstr "No se pudo descargar bridges: %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "Reintentando la solicitud de bridge (puente a Tor no propagados)... " +msgstr "Reintentando la solicitud de bridge... " msgctxt "BridgeUsageDialog" msgid "Country"

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 886a349c7af9223f6a8dcffc797a417ff44e3d94 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 11:45:24 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 2abe763..1d44908 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 02:12+0000\n" +"PO-Revision-Date: 2012-11-10 11:42+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit 5dd0dcf455b77621604e05aaa9cd6a6863f35fae Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 11:45:20 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 2abe763..1d44908 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 02:12+0000\n" +"PO-Revision-Date: 2012-11-10 11:42+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Check for orconns in connection_mark_for_close and connection_mark_and_flush, and pass the call through channel_close_for_error with a warning to avoid asserts
by andrea＠torproject.org 10 Nov '12

10 Nov '12

commit 8124398835097c3edfe0200a307092b71acfe0a0 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Nov 9 14:06:54 2012 -0800 Check for orconns in connection_mark_for_close and connection_mark_and_flush, and pass the call through channel_close_for_error with a warning to avoid asserts --- src/or/connection.c | 38 +++++++++++++++++++++++++++++++++++++- src/or/connection.h | 48 ++++++++++++++++++++++++++++++++++++++++-------- src/or/connection_or.c | 8 ++++---- 3 files changed, 81 insertions(+), 13 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 1fbce41..5aac06f 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -688,6 +688,41 @@ connection_mark_for_close_(connection_t *conn, int line, const char *file) tor_assert(line < 1<<16); /* marked_for_close can only fit a uint16_t. */ tor_assert(file); + if (conn->type == CONN_TYPE_OR) { + /* + * An or_connection should have been closed through one of the channel- + * aware functions in connection_or.c. We'll assume this is an error + * close and do that, and log a bug warning. + */ + log_warn(LD_CHANNEL | LD_BUG, + "Something tried to close an or_connection_t without going " + "through channels at %s:%d", + file, line); + connection_or_close_for_error(TO_OR_CONN(conn), 0); + } else { + /* Pass it down to the real function */ + connection_mark_for_close_internal_(conn, line, file); + } +} + +/** Mark <b>conn</b> to be closed next time we loop through + * conn_close_if_marked() in main.c; the _internal version bypasses the + * CONN_TYPE_OR checks; this should be called when you either are sure that + * if this is an or_connection_t the controlling channel has been notified + * (e.g. with connection_or_notify_error()), or you actually are the + * connection_or_close_for_error() or connection_or_close_normally function. + * For all other cases, use connection_mark_and_flush() instead, which + * checks for or_connection_t properly, instead. See below. + */ +void +connection_mark_for_close_internal_(connection_t *conn, + int line, const char *file) +{ + assert_connection_ok(conn,0); + tor_assert(line); + tor_assert(line < 1<<16); /* marked_for_close can only fit a uint16_t. */ + tor_assert(file); + if (conn->marked_for_close) { log(LOG_WARN,LD_BUG,"Duplicate call to connection_mark_for_close at %s:%d" " (first at %s:%d)", file, line, conn->marked_for_close_file, @@ -702,7 +737,8 @@ connection_mark_for_close_(connection_t *conn, int line, const char *file) * this so we can find things that call this wrongly when the asserts hit. */ log_debug(LD_CHANNEL, - "Calling connection_mark_for_close on an OR conn at %s:%d", + "Calling connection_mark_for_close_internal_() on an OR conn " + "at %s:%d", file, line); } diff --git a/src/or/connection.h b/src/or/connection.h index 6ed9e4a..b0c2a42 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -31,21 +31,53 @@ void connection_free(connection_t *conn); void connection_free_all(void); void connection_about_to_close_connection(connection_t *conn); void connection_close_immediate(connection_t *conn); -void connection_mark_for_close_(connection_t *conn,int line, const char *file); +void connection_mark_for_close_(connection_t *conn, + int line, const char *file); +void connection_mark_for_close_internal_(connection_t *conn, + int line, const char *file); #define connection_mark_for_close(c) \ connection_mark_for_close_((c), __LINE__, SHORT_FILE__) +#define connection_mark_for_close_internal(c) \ + connection_mark_for_close_internal_((c), __LINE__, SHORT_FILE__) /** * Mark 'c' for close, but try to hold it open until all the data is written. + * Use the _internal versions of connection_mark_for_close; this should be + * called when you either are sure that if this is an or_connection_t the + * controlling channel has been notified (e.g. with + * connection_or_notify_error()), or you actually are the + * connection_or_close_for_error() or connection_or_close_normally function. + * For all other cases, use connection_mark_and_flush() instead, which + * checks for or_connection_t properly, instead. See below. */ -#define connection_mark_and_flush_(c,line,file) \ - do { \ - connection_t *tmp_conn_ = (c); \ - connection_mark_for_close_(tmp_conn_, (line), (file)); \ - tmp_conn_->hold_open_until_flushed = 1; \ - IF_HAS_BUFFEREVENT(tmp_conn_, \ - connection_start_writing(tmp_conn_)); \ +#define connection_mark_and_flush_internal_(c,line,file) \ + do { \ + connection_t *tmp_conn_ = (c); \ + connection_mark_for_close_internal_(tmp_conn_, (line), (file)); \ + tmp_conn_->hold_open_until_flushed = 1; \ + IF_HAS_BUFFEREVENT(tmp_conn_, \ + connection_start_writing(tmp_conn_)); \ + } while (0) + +#define connection_mark_and_flush_internal(c) \ + connection_mark_and_flush_internal_((c), __LINE__, SHORT_FILE__) + +/** + * Mark 'c' for close, but try to hold it open until all the data is written. + */ +#define connection_mark_and_flush_(c,line,file) \ + do { \ + connection_t *tmp_conn_ = (c); \ + if (tmp_conn_->type == CONN_TYPE_OR) { \ + log_warn(LD_CHANNEL | LD_BUG, \ + "Something tried to close (and flush) an or_connection_t" \ + " without going through channels at %s:%d", \ + file, line); \ + connection_or_close_for_error(TO_OR_CONN(tmp_conn_), 1); \ + } else { \ + connection_mark_and_flush_internal_(c, line, file); \ + } \ } while (0) #define connection_mark_and_flush(c) \ diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 9cd56bb..1db2def 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1143,8 +1143,8 @@ connection_or_close_normally(or_connection_t *orconn, int flush) channel_t *chan = NULL; tor_assert(orconn); - if (flush) connection_mark_and_flush(TO_CONN(orconn)); - else connection_mark_for_close(TO_CONN(orconn)); + if (flush) connection_mark_and_flush_internal(TO_CONN(orconn)); + else connection_mark_for_close_internal(TO_CONN(orconn)); if (orconn->chan) { chan = TLS_CHAN_TO_BASE(orconn->chan); /* Don't transition if we're already in closing, closed or error */ @@ -1166,8 +1166,8 @@ connection_or_close_for_error(or_connection_t *orconn, int flush) channel_t *chan = NULL; tor_assert(orconn); - if (flush) connection_mark_and_flush(TO_CONN(orconn)); - else connection_mark_for_close(TO_CONN(orconn)); + if (flush) connection_mark_and_flush_internal(TO_CONN(orconn)); + else connection_mark_for_close_internal(TO_CONN(orconn)); if (orconn->chan) { chan = TLS_CHAN_TO_BASE(orconn->chan); /* Don't transition if we're already in closing, closed or error */

1 0

[tor/master] Make everything in connection.c that uses connection_or_notify_error() also use connection_mark_and_close_internal() to avoid spurious warnings
by andrea＠torproject.org 10 Nov '12

10 Nov '12

commit 99e82cab30efdacd464deec524ee0da3576e69d9 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Nov 9 14:19:45 2012 -0800 Make everything in connection.c that uses connection_or_notify_error() also use connection_mark_and_close_internal() to avoid spurious warnings --- src/or/connection.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 5aac06f..e6755f4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2763,7 +2763,11 @@ connection_handle_read_impl(connection_t *conn) } } connection_close_immediate(conn); /* Don't flush; connection is dead. */ - connection_mark_for_close(conn); + /* + * This can bypass normal channel checking since we did + * connection_or_notify_error() above. + */ + connection_mark_for_close_internal(conn); return -1; } n_read += buf_datalen(conn->inbuf) - before; @@ -3279,7 +3283,11 @@ connection_handle_write_impl(connection_t *conn, int force) tor_socket_strerror(e)); connection_close_immediate(conn); - connection_mark_for_close(conn); + /* + * This can bypass normal channel checking since we did + * connection_or_notify_error() above. + */ + connection_mark_for_close_internal(conn); return -1; } else { return 0; /* no change, see if next time is better */ @@ -3306,7 +3314,11 @@ connection_handle_write_impl(connection_t *conn, int force) "TLS error in connection_tls_" "continue_handshake()"); connection_close_immediate(conn); - connection_mark_for_close(conn); + /* + * This can bypass normal channel checking since we did + * connection_or_notify_error() above. + */ + connection_mark_for_close_internal(conn); return -1; } return 0; @@ -3336,7 +3348,11 @@ connection_handle_write_impl(connection_t *conn, int force) "TLS error in during flush" : "TLS closed during flush"); connection_close_immediate(conn); - connection_mark_for_close(conn); + /* + * This can bypass normal channel checking since we did + * connection_or_notify_error() above. + */ + connection_mark_for_close_internal(conn); return -1; case TOR_TLS_WANTWRITE: log_debug(LD_NET,"wanted write."); @@ -3401,7 +3417,11 @@ connection_handle_write_impl(connection_t *conn, int force) "connection_flushed_some()"); } - connection_mark_for_close(conn); + /* + * This can bypass normal channel checking since we did + * connection_or_notify_error() above. + */ + connection_mark_for_close_internal(conn); } }

1 0

[tor/master] Add changes file for connection_mark_for_close()/connection_mark_and_flush() or_connection_t checking
by andrea＠torproject.org 10 Nov '12

10 Nov '12

commit fc1a9a13cf427ec7a319086c820408847fbc189b Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Nov 10 02:38:40 2012 -0800 Add changes file for connection_mark_for_close()/connection_mark_and_flush() or_connection_t checking --- changes/check_for_orconn_on_close | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/check_for_orconn_on_close b/changes/check_for_orconn_on_close new file mode 100644 index 0000000..4d76d5e --- /dev/null +++ b/changes/check_for_orconn_on_close @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Check for closing an or_connection_t without going through correct + channel functions; emit a warning and then call + connection_or_close_for_error() so we don't assert as in 7212 and 7267.

1 0

[tor/master] Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor
by andrea＠torproject.org 10 Nov '12

10 Nov '12

commit 0523c8de7d7f775e9a89134340f88ae00bde158b Merge: 713736a fc1a9a1 Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Nov 10 03:24:41 2012 -0800 Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor changes/check_for_orconn_on_close | 4 ++ src/or/connection.c | 68 +++++++++++++++++++++++++++++++++--- src/or/connection.h | 48 +++++++++++++++++++++---- src/or/connection_or.c | 8 ++-- 4 files changed, 110 insertions(+), 18 deletions(-)

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 10 Nov '12

10 Nov '12

commit cc47f5f9dfee2fb8b48cd9734e05de8d6269bb3f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 10:45:44 2012 +0000 Update translations for torcheck_completed --- nl/torcheck.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nl/torcheck.po b/nl/torcheck.po index 96d1e62..d87340e 100644 --- a/nl/torcheck.po +++ b/nl/torcheck.po @@ -3,6 +3,7 @@ # # Translators: # <flabber(a)online.be>, 2011. +# Richard E. van der Luit <nippur(a)fedoraproject.org>, 2012. # Shondoit Walker <shondoit+transifex(a)gmail.com>, 2012. # <therbom(a)gmail.com>, 2012. msgid "" @@ -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: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-09-25 10:45+0000\n" -"Last-Translator: therbom <therbom(a)gmail.com>\n" +"PO-Revision-Date: 2012-11-10 10:38+0000\n" +"Last-Translator: Richard E. van der Luit <nippur(a)fedoraproject.org>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +46,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Als je een Tor client probeert te gebruiker, raadpleeg de <a href=\"https://www.torproject.org/\">Tor website</a> en in het bijzonder de <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructies om je Tor client in te stellen</a>." +msgstr "Als u een Tor-client probeert te gebruiken, raadpleegt u de <a href=\"https://www.torproject.org/\">Tor-website</a> en in het bijzonder de <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructies om uw Tor-client in te stellen</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Helaas, uw verzoek is niet aangekomen of een onverwacht antwoord is ontvangen." @@ -56,4 +57,4 @@ msgid "" msgstr "Een tijdelijke storing verhindert ons om te bepalen of uw IP-adres een <a href=\"https://www.torproject.org/\">Tor</a>-node is." msgid "Your IP address appears to be: " -msgstr "Klaarblijkelijk uw IP-adres:" +msgstr "Uw IP-adres (b)lijkt te zijn: "

1 0