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

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 22 May '14

22 May '14

commit b977e47a33c2b7f47474aa0e0b1627fe0181ce97 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 00:15:55 2014 +0000 Update translations for tor-and-https_completed --- uk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk.po b/uk.po index bae94b1..19e5162 100644 --- a/uk.po +++ b/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-21 09:17+0200\n" -"PO-Revision-Date: 2014-05-22 03:54+0000\n" +"PO-Revision-Date: 2014-05-23 00:09+0000\n" "Last-Translator: Андрій Бандура <andriykopanytsia(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 22 May '14

22 May '14

commit 410c79b4da2ee4498336fe4ae2bbc279a2821847 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 00:15:52 2014 +0000 Update translations for tor-and-https --- uk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk.po b/uk.po index bae94b1..19e5162 100644 --- a/uk.po +++ b/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-21 09:17+0200\n" -"PO-Revision-Date: 2014-05-22 03:54+0000\n" +"PO-Revision-Date: 2014-05-23 00:09+0000\n" "Last-Translator: Андрій Бандура <andriykopanytsia(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] changes file for 12064_part1
by nickm＠torproject.org 22 May '14

22 May '14

commit 1356ef1176099bf56d047fbdc817a99fc1ed76ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 22 19:49:59 2014 -0400 changes file for 12064_part1 --- changes/bug12064_part1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug12064_part1 b/changes/bug12064_part1 new file mode 100644 index 0000000..b40b64a --- /dev/null +++ b/changes/bug12064_part1 @@ -0,0 +1,4 @@ + o Minor bugfixes (seccomp sandbox): + - Avoid warnings when running with sandboxing and node statistics + enabled at the same time. + Fixes part of 12064; bugfix on 0.2.5.1-alpha. Patch from Michael Wolf.

1 0

[tor/master] sandbox: allow access to various stats/*-stats files
by nickm＠torproject.org 22 May '14

22 May '14

commit 387f294d40c9b5c0bb9d6f29b85b7da1a185bc8c Author: Michael Wolf <mikewolf(a)riseup.net> Date: Tue May 20 22:52:16 2014 -0400 sandbox: allow access to various stats/*-stats files Fix for 12064 part 1 --- src/or/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1168f43..8e241d4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2854,6 +2854,14 @@ sandbox_init_filter(void) get_datadir_fname2("stats", "bridge-stats.tmp"), get_datadir_fname2("stats", "dirreq-stats"), get_datadir_fname2("stats", "dirreq-stats.tmp"), + get_datadir_fname2("stats", "entry-stats"), + get_datadir_fname2("stats", "entry-stats.tmp"), + get_datadir_fname2("stats", "exit-stats"), + get_datadir_fname2("stats", "exit-stats.tmp"), + get_datadir_fname2("stats", "buffer-stats"), + get_datadir_fname2("stats", "buffer-stats.tmp"), + get_datadir_fname2("stats", "conn-stats"), + get_datadir_fname2("stats", "conn-stats.tmp"), get_datadir_fname("fingerprint"), get_datadir_fname("fingerprint.tmp"), get_datadir_fname("hashed-fingerprint"), @@ -2877,6 +2885,10 @@ sandbox_init_filter(void) RENAME_SUFFIX2("keys", "secret_onion_key.old", ".tmp"); RENAME_SUFFIX2("stats", "bridge-stats", ".tmp"); RENAME_SUFFIX2("stats", "dirreq-stats", ".tmp"); + RENAME_SUFFIX2("stats", "entry-stats", ".tmp"); + RENAME_SUFFIX2("stats", "exit-stats", ".tmp"); + RENAME_SUFFIX2("stats", "buffer-stats", ".tmp"); + RENAME_SUFFIX2("stats", "conn-stats", ".tmp"); RENAME_SUFFIX("hashed-fingerprint", ".tmp"); RENAME_SUFFIX("router-stability", ".tmp");

1 0

[tor/master] Documentation fix: DataDir/status/* -> DataDir/stats/*
by nickm＠torproject.org 22 May '14

22 May '14

commit c8af95d3366157f6c3d5fc345d9d9a3914c0efe2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 22 19:45:45 2014 -0400 Documentation fix: DataDir/status/* -> DataDir/stats/* Our documentation had the name of this directory wrong. --- changes/stats_not_status | 4 ++++ doc/tor.1.txt | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/changes/stats_not_status b/changes/stats_not_status new file mode 100644 index 0000000..e2bc37e --- /dev/null +++ b/changes/stats_not_status @@ -0,0 +1,4 @@ + o Minor bugfixes (documentation): + - Correct the documenation so that it lists the correct directories + for the stats files. (They are in a subdirectory called "stats", + not "status".) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2f97ecd..2d89e62 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2364,27 +2364,27 @@ __DataDirectory__**/router-stability**:: router mean-time-between-failures so that authorities have a good idea of how to set their Stable flags. -__DataDirectory__**/status/dirreq-stats**:: +__DataDirectory__**/stats/dirreq-stats**:: Only used by directory caches and authorities. This file is used to collect directory request statistics. -__DataDirectory__**/status/entry-stats**:: +__DataDirectory__**/stats/entry-stats**:: Only used by servers. This file is used to collect incoming connection statistics by Tor entry nodes. -__DataDirectory__**/status/bridge-stats**:: +__DataDirectory__**/stats/bridge-stats**:: Only used by servers. This file is used to collect incoming connection statistics by Tor bridges. -__DataDirectory__**/status/exit-stats**:: +__DataDirectory__**/stats/exit-stats**:: Only used by servers. This file is used to collect outgoing connection statistics by Tor exit routers. -__DataDirectory__**/status/buffer-stats**:: +__DataDirectory__**/stats/buffer-stats**:: Only used by servers. This file is used to collect buffer usage history. -__DataDirectory__**/status/conn-stats**:: +__DataDirectory__**/stats/conn-stats**:: Only used by servers. This file is used to collect approximate connection history (number of active connections over time).

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 22 May '14

22 May '14

commit 47a795723be9a45e88b98e00431dd411b8ad3b0d Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 22 21:15:13 2014 +0000 Update translations for torcheck_completed --- es/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 2157940..dc8962f 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -2,6 +2,7 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# alexiulacio <alexi.ulacio(a)gmail.com>, 2014 # her_tor_es_ar <cvmay08(a)gmail.com>, 2014 # cronayu <itacronayu(a)hotmail.com>, 2012 # Envite <envite(a)rolamasao.org>, 2013 @@ -14,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-09 22:30+0000\n" -"Last-Translator: her_tor_es_ar <cvmay08(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-22 21:08+0000\n" +"Last-Translator: alexiulacio <alexi.ulacio(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,10 +64,10 @@ msgid "Your IP address appears to be: " msgstr "Su dirección IP parece ser: " msgid "Are you using Tor?" -msgstr "¿Está utilizando Tor?" +msgstr "¿Está usando Tor?" msgid "This page is also available in the following languages:" -msgstr "Esta página también está disponible en los siguientes idiomas:" +msgstr "Esta página también está disponible tambien en los siguientes idiomas:" msgid "For more information about this exit relay, see:" msgstr "Para más información acerca de este repetidor de salida ('exit relay'), vea:" @@ -74,7 +75,7 @@ msgstr "Para más información acerca de este repetidor de salida ('exit relay') msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "El Projecto Tor es una entidad US 501(c)(3) sin ánimo de lucro dedicada a investigar, desarrollar y educar acerca del anonimato y la privacidad en línea." +msgstr "El Projecto Tor es una entidad US 501(c)(3) sin fines de lucro dedicada a la investigacion, desarrollo y educacion del anonimato y la privacidad en línea." msgid "Learn More »" msgstr "Aprender más »"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 22 May '14

22 May '14

commit e984df2a4fe5c112d3beefecb286ab8a68006838 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 22 21:15:10 2014 +0000 Update translations for torcheck --- es/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 2157940..dc8962f 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -2,6 +2,7 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# alexiulacio <alexi.ulacio(a)gmail.com>, 2014 # her_tor_es_ar <cvmay08(a)gmail.com>, 2014 # cronayu <itacronayu(a)hotmail.com>, 2012 # Envite <envite(a)rolamasao.org>, 2013 @@ -14,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-09 22:30+0000\n" -"Last-Translator: her_tor_es_ar <cvmay08(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-22 21:08+0000\n" +"Last-Translator: alexiulacio <alexi.ulacio(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,10 +64,10 @@ msgid "Your IP address appears to be: " msgstr "Su dirección IP parece ser: " msgid "Are you using Tor?" -msgstr "¿Está utilizando Tor?" +msgstr "¿Está usando Tor?" msgid "This page is also available in the following languages:" -msgstr "Esta página también está disponible en los siguientes idiomas:" +msgstr "Esta página también está disponible tambien en los siguientes idiomas:" msgid "For more information about this exit relay, see:" msgstr "Para más información acerca de este repetidor de salida ('exit relay'), vea:" @@ -74,7 +75,7 @@ msgstr "Para más información acerca de este repetidor de salida ('exit relay') msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "El Projecto Tor es una entidad US 501(c)(3) sin ánimo de lucro dedicada a investigar, desarrollar y educar acerca del anonimato y la privacidad en línea." +msgstr "El Projecto Tor es una entidad US 501(c)(3) sin fines de lucro dedicada a la investigacion, desarrollo y educacion del anonimato y la privacidad en línea." msgid "Learn More »" msgstr "Aprender más »"

1 0

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

22 May '14

commit ca53f0048f656460bf6efc592a416ea67ec2fd9c Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 22 20:45:31 2014 +0000 Update translations for tor-launcher-properties_completed --- es/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index a33c23e..c968541 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -11,7 +11,7 @@ torlauncher.tor_control_failed=Fallo al tomar control de Tor. torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión a la red Tor. torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). -torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S +torlauncher.unable_to_start_tor=Imposible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo "torrc" torlauncher.datadir_missing=El directorio de datos de Tor no existe.

1 0

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

22 May '14

commit 017b1a57775366b03f28a0409332abcf717c4648 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 22 20:45:28 2014 +0000 Update translations for tor-launcher-properties --- es/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index a33c23e..c968541 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -11,7 +11,7 @@ torlauncher.tor_control_failed=Fallo al tomar control de Tor. torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión a la red Tor. torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). -torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S +torlauncher.unable_to_start_tor=Imposible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo "torrc" torlauncher.datadir_missing=El directorio de datos de Tor no existe.

1 0

[tor/master] Eliminate #ifdef ENABLE_MEMPOOLS in packed_cell_new/free()
by nickm＠torproject.org 22 May '14

22 May '14

commit 170e0df7417e78f7b689f3189e7a0b5b8dfd2722 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed May 21 10:53:25 2014 -0700 Eliminate #ifdef ENABLE_MEMPOOLS in packed_cell_new/free() --- src/or/relay.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index e593f87..5c430a6 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2268,6 +2268,22 @@ clean_cell_pool(void) mp_pool_clean(cell_pool, 0, 1); } +#define relay_alloc_cell() \ + mp_pool_get(cell_pool) +#define relay_free_cell(cell) \ + mp_pool_release(cell) + +#define RELAY_CELL_MEM_COST (sizeof(packed_cell_t) + MP_POOL_ITEM_OVERHEAD) + +#else /* !ENABLE_MEMPOOLS case */ + +#define relay_alloc_cell() \ + tor_malloc_zero(sizeof(packed_cell_t)) +#define relay_free_cell(cell) \ + tor_free(cell) + +#define RELAY_CELL_MEM_COST (sizeof(packed_cell_t)) + #endif /* ENABLE_MEMPOOLS */ /** Release storage held by <b>cell</b>. */ @@ -2275,11 +2291,7 @@ static INLINE void packed_cell_free_unchecked(packed_cell_t *cell) { --total_cells_allocated; -#ifdef ENABLE_MEMPOOLS - mp_pool_release(cell); -#else - tor_free(cell); -#endif /* ENABLE_MEMPOOLS */ + relay_free_cell(cell); } /** Allocate and return a new packed_cell_t. */ @@ -2287,11 +2299,7 @@ STATIC packed_cell_t * packed_cell_new(void) { ++total_cells_allocated; -#ifdef ENABLE_MEMPOOLS - return mp_pool_get(cell_pool); -#else - return tor_malloc(sizeof(packed_cell_t)); -#endif + return relay_alloc_cell(); } /** Return a packed cell used outside by channel_t lower layer */ @@ -2402,11 +2410,7 @@ cell_queue_pop(cell_queue_t *queue) size_t packed_cell_mem_cost(void) { -#ifdef ENABLE_MEMPOOLS - return sizeof(packed_cell_t) + MP_POOL_ITEM_OVERHEAD; -#else - return sizeof(packed_cell_t); -#endif /* ENABLE_MEMPOOLS */ + return RELAY_CELL_MEM_COST; } /** DOCDOC */

1 0