October 2011 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 25 Oct '11

25 Oct '11

commit a518dd66506e44c1318c44777187dc82c275329e Merge: aa3c709 ac115f1 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Oct 25 19:34:42 2011 -0400 Merge branch 'maint-0.2.2' changes/bug4309 | 5 +++++ doc/tor.1.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] unmangle the fingerprint example in the man page
by arma＠torproject.org 25 Oct '11

25 Oct '11

commit ac115f112543c58828a9d049b78a491ff430af10 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Oct 25 18:24:37 2011 -0400 unmangle the fingerprint example in the man page Remove a confusing dollar sign from the example fingerprint in the man page, and also make example fingerprint a valid one. --- changes/bug4309 | 5 +++++ doc/tor.1.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug4309 b/changes/bug4309 new file mode 100644 index 0000000..f4f910e --- /dev/null +++ b/changes/bug4309 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Remove a confusing dollar sign from the example fingerprint in the + man page, and also make example fingerprint a valid one. Fixes bug + 4309; bugfix on 0.2.1.3-alpha. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9ff19e7..703cc82 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -509,7 +509,7 @@ The following options are useful only for clients (that is, if A list of identity fingerprints, nicknames, country codes and address patterns of nodes to avoid when building a circuit. (Example: - ExcludeNodes SlowServer, $ EFFFFFFFFFFFFFFF, \{cc}, 255.254.0.0/8) + + ExcludeNodes SlowServer, ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + By default, this option is treated as a preference that Tor is allowed to override in order to keep working.

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 25 Oct '11

25 Oct '11

commit e76f626ff6aa4f7ea869996f10b073a3f951f040 Merge: ee2efc5 ac115f1 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Oct 25 19:34:20 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug4309 | 5 +++++ doc/tor.1.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] unmangle the fingerprint example in the man page
by arma＠torproject.org 25 Oct '11

25 Oct '11

commit ac115f112543c58828a9d049b78a491ff430af10 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Oct 25 18:24:37 2011 -0400 unmangle the fingerprint example in the man page Remove a confusing dollar sign from the example fingerprint in the man page, and also make example fingerprint a valid one. --- changes/bug4309 | 5 +++++ doc/tor.1.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug4309 b/changes/bug4309 new file mode 100644 index 0000000..f4f910e --- /dev/null +++ b/changes/bug4309 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Remove a confusing dollar sign from the example fingerprint in the + man page, and also make example fingerprint a valid one. Fixes bug + 4309; bugfix on 0.2.1.3-alpha. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9ff19e7..703cc82 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -509,7 +509,7 @@ The following options are useful only for clients (that is, if A list of identity fingerprints, nicknames, country codes and address patterns of nodes to avoid when building a circuit. (Example: - ExcludeNodes SlowServer, $ EFFFFFFFFFFFFFFF, \{cc}, 255.254.0.0/8) + + ExcludeNodes SlowServer, ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + By default, this option is treated as a preference that Tor is allowed to override in order to keep working.

1 0

[torspec/master] fix a typo
by arma＠torproject.org 25 Oct '11

25 Oct '11

commit 40b32dd1742753e5cf04d99a0f8852997975f084 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Oct 25 19:09:37 2011 -0400 fix a typo --- proposals/187-allow-client-auth.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/proposals/187-allow-client-auth.txt b/proposals/187-allow-client-auth.txt index 5e71599..6a9e2da 100644 --- a/proposals/187-allow-client-auth.txt +++ b/proposals/187-allow-client-auth.txt @@ -27,7 +27,7 @@ Motivation: easily. The client should prove to the bridge that it's authorized to know about the bridge, before the bridge acts like a bridge. If the client doesn't show knowledge of the proper - secret, the bridge should at like an HTTPS server or a bittorrent + secret, the bridge should act like an HTTPS server or a bittorrent tracker or something. This proposal *does not* specify a way for clients to authorize

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 25 Oct '11

25 Oct '11

commit c1cc33351ea786efc32800987943d6f222cd3177 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 25 22:15:23 2011 +0000 Update translations for gettor --- fr/gettor.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fr/gettor.po b/fr/gettor.po index 1e29a49..31c1f42 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -589,6 +589,6 @@ msgstr "QUESTION:" #: lib/gettor/i18n.py:272 msgid "ANSWER:" -msgstr "" +msgstr "REPONSE:"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 25 Oct '11

25 Oct '11

commit f8daca082974cb446352191609a0e149c57ad790 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 25 22:04:53 2011 +0000 Update translations for vidalia_help --- it/config.po | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/it/config.po b/it/config.po index 6228c1b..db29b40 100644 --- a/it/config.po +++ b/it/config.po @@ -1,13 +1,14 @@ # # Translators: +# <tru74368(a)yahoo.com>, 2011. # zfrns84 <silviazaf(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2011-05-06 12:30+0000\n" -"Last-Translator: zfrns84 <silviazaf(a)gmail.com>\n" +"PO-Revision-Date: 2011-10-25 21:50+0000\n" +"Last-Translator: fetidyoo <tru74368(a)yahoo.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgid "" msgstr "" "Vidalia ti permette di configurare alcuni degli aspetti di Vidalia e di Tor " "più personalizzati dagli utenti. Consente, inoltre, di impostare e gestire " -"un <a href=\"server.html\"> relay Tor</a> in modo da agevolare la crescita " +"un <a href=\"server.html\">relay Tor</a> in modo da agevolare la crescita " "della rete Tor." #. type: Content of: <html><body> @@ -72,8 +73,9 @@ msgid "" "automatically start Tor when Vidalia starts. You can also configure Vidalia " "to run when your system starts (Windows only)." msgstr "" -"Opzioni di avvio: tali impostazioni permettono di eseguire " -"automaticamente Tor all'avvio di Vidalia (solo con Windows)." +"Opzioni di avvio: Questa impostazione permette di eseguire " +"automaticamente Tor all'avvio di Vidalia. Puoi anche configurare Vidalia " +"affinché si avvii quando si avvia il sistema (solo con Windows)." #. type: Content of: <html><body> #: en/config.html:46 @@ -105,7 +107,7 @@ msgid "" "you can also enter the Username and Password you use to " "connect to your proxy. Otherwise, you can leave those fields blank." msgstr "" -"Utilizzo un proxi per l'accesso a internet: se la connessione " +"Utilizzo un proxi per l'accesso a internet: Se la connessione " "internet in uso richiede un proxy HTTP, è possibile configurare Tor in " "maniera che invii tutte le directory richieste e i collegamenti relay Tor " "attraverso il proxy personale. Si deve specificare almeno un nome host o " @@ -395,7 +397,7 @@ msgstr "<a name=\"services\"/>" #. type: Content of: <html><body><h3> #: en/config.html:190 msgid "Hidden Service Settings" -msgstr "Impostazioni di servizio nascoste" +msgstr "Impostazioni dei servizi nascosti" #. type: Content of: <html><body> #: en/config.html:192

1 0

[tor/master] Add percentiles to the desc stats reporting
by nickm＠torproject.org 25 Oct '11

25 Oct '11

commit 7fbc0184334da7325d983d187ee14fdc0326123a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Oct 25 14:11:13 2011 +0200 Add percentiles to the desc stats reporting To get a better idea what's going on on Tonga, add some code to report how often the most and least frequently fetched descriptor was fetched, as well as 25, 50, 75 percentile. Also ensure we only count bridge descriptors here. --- changes/ticket4294 | 8 ++++++++ src/or/dirserv.c | 13 ++++++++++++- src/or/rephist.c | 43 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/changes/ticket4294 b/changes/ticket4294 new file mode 100644 index 0000000..5041495 --- /dev/null +++ b/changes/ticket4294 @@ -0,0 +1,8 @@ +(NOTE: THIS SHOULD REPLACE THE TICKET 4200 ENTRY IN THE CHANGELOG) + o Minor features: + - The Bridge Authority now writes statistics on how many bridge + descriptors it gave out in total, and how many unique descriptors it + gave out. It also lists how often the most and least commonly fetched + descriptors were given out, as well as the median and 25/75 percentile. + Implements tickets 4200 and 4294. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 4b9587b..5cb4aba 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3488,6 +3488,8 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) conn->dir_spool_src == DIR_SPOOL_EXTRA_BY_DIGEST); time_t publish_cutoff = time(NULL)-ROUTER_MAX_AGE_TO_PUBLISH; + const or_options_t *options = get_options(); + while (smartlist_len(conn->fingerprint_stack) && connection_get_outbuf_len(TO_CONN(conn)) < DIRSERV_BUFFER_MIN) { const char *body; @@ -3509,7 +3511,16 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) * unknown bridge descriptor has shown up between then and now. */ continue; } - rep_hist_note_desc_served(sd->identity_digest); + + /** If we are the bridge authority and the descriptor is a bridge + * descriptor, remember that we served this descriptor for desc stats. */ + if (options->BridgeAuthoritativeDir && by_fp) { + const routerinfo_t *router = + router_get_by_id_digest(sd->identity_digest); + tor_assert(router); + if (router->purpose == ROUTER_PURPOSE_BRIDGE) + rep_hist_note_desc_served(sd->identity_digest); + } body = signed_descriptor_get_body(sd); if (conn->zlib_state) { /* XXXX022 This 'last' business should actually happen on the last diff --git a/src/or/rephist.c b/src/or/rephist.c index f8ebe64..359e488 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2643,7 +2643,7 @@ rep_hist_reset_desc_stats(time_t now) void rep_hist_desc_stats_term(void) { - digestmap_free(served_descs, NULL); + digestmap_free(served_descs, _tor_free); served_descs = NULL; start_of_served_descs_stats_interval = 0; total_descriptor_downloads = 0; @@ -2659,18 +2659,43 @@ rep_hist_format_desc_stats(time_t now) char t[ISO_TIME_LEN+1]; char *result; + digestmap_iter_t *iter; + const char *key; + void *val; + unsigned size; + int *vals; + int n = 0, *count; + if (!start_of_served_descs_stats_interval) return NULL; + size = digestmap_size(served_descs); + vals = tor_malloc(size * sizeof(int)); + + for (iter = digestmap_iter_init(served_descs); !digestmap_iter_done(iter); + iter = digestmap_iter_next(served_descs, iter) ) { + digestmap_iter_get(iter, &key, &val); + count = val; + vals[n++] = *count; + (void)key; + } + format_iso_time(t, now); tor_asprintf(&result, - "served-descs-stats-end %s (%d s) total=%lu unique=%u\n", + "served-descs-stats-end %s (%d s) total=%lu unique=%u " + "max=%d q3=%d md=%d q1=%d min=%d\n", t, (unsigned) (now - start_of_served_descs_stats_interval), total_descriptor_downloads, - digestmap_size(served_descs)); - + size, + find_nth_int(vals, size, size-1), + find_nth_int(vals, size, (3*size-1)/4), + find_nth_int(vals, size, (size-1)/2), + find_nth_int(vals, size, (size-1)/4), + find_nth_int(vals, size, 0)); + + tor_free(vals); return result; } @@ -2712,9 +2737,17 @@ rep_hist_desc_stats_write(time_t now) void rep_hist_note_desc_served(const char * desc) { + int *val; if (!served_descs) return; // We're not collecting stats - digestmap_set(served_descs, desc, (void *)1); + val = digestmap_get(served_descs, desc); + if (!val) { + val = tor_malloc(sizeof(int)); + *val = 1; + digestmap_set(served_descs, desc, val); + } else { + (*val)++; + } total_descriptor_downloads++; }

1 0

[tor/master] Avoid likely memory fragmentation from rep_hist_note_descs_served
by nickm＠torproject.org 25 Oct '11

25 Oct '11

commit 7ab0b5ff713aa609cbbd3c2152b34a7ef60d3e2a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 25 15:32:26 2011 -0400 Avoid likely memory fragmentation from rep_hist_note_descs_served When you're doing malloc(sizeof(int)), something may well have gone wrong. This technique is a bit abusive, but we're already relying on it working correctly in geoip.c. --- src/or/rephist.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 359e488..6bbb93b 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2643,7 +2643,7 @@ rep_hist_reset_desc_stats(time_t now) void rep_hist_desc_stats_term(void) { - digestmap_free(served_descs, _tor_free); + digestmap_free(served_descs, NULL); served_descs = NULL; start_of_served_descs_stats_interval = 0; total_descriptor_downloads = 0; @@ -2664,7 +2664,7 @@ rep_hist_format_desc_stats(time_t now) void *val; unsigned size; int *vals; - int n = 0, *count; + int n = 0; if (!start_of_served_descs_stats_interval) return NULL; @@ -2674,10 +2674,11 @@ rep_hist_format_desc_stats(time_t now) for (iter = digestmap_iter_init(served_descs); !digestmap_iter_done(iter); iter = digestmap_iter_next(served_descs, iter) ) { + uintptr_t count; digestmap_iter_get(iter, &key, &val); - count = val; - vals[n++] = *count; - (void)key; + count = (uintptr_t)val; + vals[n++] = (int)count; + (void)key; } format_iso_time(t, now); @@ -2737,17 +2738,15 @@ rep_hist_desc_stats_write(time_t now) void rep_hist_note_desc_served(const char * desc) { - int *val; + void *val; + uintptr_t count; if (!served_descs) return; // We're not collecting stats val = digestmap_get(served_descs, desc); - if (!val) { - val = tor_malloc(sizeof(int)); - *val = 1; - digestmap_set(served_descs, desc, val); - } else { - (*val)++; - } + count = (uintptr_t)val; + if (count != INT_MAX) + ++count; + digestmap_set(served_descs, desc, (void*)count); total_descriptor_downloads++; }

1 0

[tor/master] Merge branch 'ticket4294'
by nickm＠torproject.org 25 Oct '11

25 Oct '11

commit aa3c70922002b1fbb8fa5e60fbfe0c25d2d1abae Merge: ea0518f 7ab0b5f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 25 17:53:55 2011 -0400 Merge branch 'ticket4294' changes/ticket4294 | 8 ++++++++ src/or/dirserv.c | 13 ++++++++++++- src/or/rephist.c | 40 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 56 insertions(+), 5 deletions(-)

1 0