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

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 6f82ae44cb85e61a729ccb7ce47451dae97e8602 Merge: f8c1ab7 97dbff5 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 16:41:43 2012 -0400 Merge branch 'maint-0.2.3' doc/tor.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.3] Update the minimum bandwidth for a public relay
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 97dbff51e60273b29d7dc15e4106c600e8efa34e Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 5 16:40:57 2012 -0400 Update the minimum bandwidth for a public relay The current cutoff is 30KB, but in reality a useful cutoff is probably more like 50KB or 100KB. --- doc/tor.1.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 62259b7..0bd9709 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -126,8 +126,8 @@ GENERAL OPTIONS A token bucket limits the average incoming bandwidth usage on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the - public network, this needs to be _at the very least_ 20 KB (that is, - 20480 bytes). (Default: 5 MB) + public network, this needs to be _at the very least_ 30 KB (that is, + 30720 bytes). (Default: 5 MB) **BandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: Limit the maximum token bucket size (also known as the burst) to the given

1 0

[tor/master] Avoid segfault if EntryGuardPathBias precedes EntryGuard
by nickm＠torproject.org 05 Sep '12

05 Sep '12

commit 9d9ca264ec7505cdaf4a0032eac4489be6a52076 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 13:27:54 2012 -0400 Avoid segfault if EntryGuardPathBias precedes EntryGuard Fix for bug 6774; bugfix on 0.2.3.17-beta. --- changes/bug6774 | 4 ++++ src/or/circuitbuild.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug6774 b/changes/bug6774 new file mode 100644 index 0000000..0c137fd --- /dev/null +++ b/changes/bug6774 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid crashing on a malformed state file where EntryGuardPathBias + precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e557601..9d52b5e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4877,6 +4877,12 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) const or_options_t *options = get_options(); unsigned hop_cnt, success_cnt; + if (!node) { + *msg = tor_strdup("Unable to parse entry nodes: " + "EntryGuardPathBias without EntryGuard"); + break; + } + if (tor_sscanf(line->value, "%u %u", &success_cnt, &hop_cnt) != 2) { log_warn(LD_GENERAL, "Unable to parse guard path bias info: " "Misformated EntryGuardPathBias %s", escaped(line->value));

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 05 Sep '12

05 Sep '12

commit f8c1ab7bbf7e7f4528406ae5ba7837866642549d Merge: 0770e4c 9d9ca26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 16:25:13 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6774 | 4 ++++ src/or/circuitbuild.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.3] Avoid segfault if EntryGuardPathBias precedes EntryGuard
by nickm＠torproject.org 05 Sep '12

05 Sep '12

commit 9d9ca264ec7505cdaf4a0032eac4489be6a52076 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 13:27:54 2012 -0400 Avoid segfault if EntryGuardPathBias precedes EntryGuard Fix for bug 6774; bugfix on 0.2.3.17-beta. --- changes/bug6774 | 4 ++++ src/or/circuitbuild.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug6774 b/changes/bug6774 new file mode 100644 index 0000000..0c137fd --- /dev/null +++ b/changes/bug6774 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid crashing on a malformed state file where EntryGuardPathBias + precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e557601..9d52b5e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4877,6 +4877,12 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) const or_options_t *options = get_options(); unsigned hop_cnt, success_cnt; + if (!node) { + *msg = tor_strdup("Unable to parse entry nodes: " + "EntryGuardPathBias without EntryGuard"); + break; + } + if (tor_sscanf(line->value, "%u %u", &success_cnt, &hop_cnt) != 2) { log_warn(LD_GENERAL, "Unable to parse guard path bias info: " "Misformated EntryGuardPathBias %s", escaped(line->value));

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 05 Sep '12

05 Sep '12

commit 14783ad6593cb41738c9c239e92d94dd506e30d0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 5 19:15:10 2012 +0000 Update translations for vidalia --- sk/vidalia_sk.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po index e92f8c6..a59dd14 100644 --- a/sk/vidalia_sk.po +++ b/sk/vidalia_sk.po @@ -9,14 +9,14 @@ 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:52+0000\n" -"PO-Revision-Date: 2012-04-21 12:37+0000\n" -"Last-Translator: eduardzanony <eduard.zanony(a)gmail.com>\n" +"PO-Revision-Date: 2012-09-05 19:06+0000\n" +"Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sk\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -2036,7 +2036,7 @@ msgctxt "MainWindow" msgid "" "The currently installed version of Tor is out of date or no longer " "recommended." -msgstr "" +msgstr "Súčasná verzia Tor nie je aktuálna alebo sa už viacej neodporúča používať." msgctxt "MainWindow" msgid "" @@ -2045,7 +2045,7 @@ msgstr "" msgctxt "MainWindow" msgid "Potentially Unsafe Connection" -msgstr "" +msgstr "Potenciálne Nebezpečné Pripojenie" msgctxt "MainWindow" msgid "" @@ -2059,7 +2059,7 @@ msgstr "" msgctxt "MainWindow" msgid "Your software is up to date" -msgstr "" +msgstr "Váš softvér je aktuálny" msgctxt "MainWindow" msgid ""

1 0

[tor/master] Whitespace fixes.
by arma＠torproject.org 05 Sep '12

05 Sep '12

commit 0770e4ccdbda2e71ad0a45d528b125df5b8db1a3 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Sep 5 19:40:15 2012 +0200 Whitespace fixes. --- src/common/address.c | 2 +- src/or/dirvote.c | 3 ++- src/or/dirvote.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index e5862be..dffbcaf 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1697,7 +1697,6 @@ tor_addr_hostname_is_local(const char *name) !strcasecmpend(name, ".local"); } - /** Return a newly allocated tor_addr_port_t with <b>addr</b> and <b>port</b> filled in. */ tor_addr_port_t * @@ -1709,3 +1708,4 @@ tor_addr_port_new(const tor_addr_t *addr, uint16_t port) ap->port = port; return ap; } + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 082a1ef..8e85b2b 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -485,7 +485,8 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, } SMARTLIST_FOREACH_END(rs); smartlist_sort(alt_orports, _compare_orports); - most_alt_orport = smartlist_get_most_frequent(alt_orports, _compare_orports); + most_alt_orport = smartlist_get_most_frequent(alt_orports, + _compare_orports); if (most_alt_orport) { memcpy(best_alt_orport_out, most_alt_orport, sizeof(tor_addr_port_t)); log_debug(LD_DIR, "\"a\" line winner for %s is %s:%d", diff --git a/src/or/dirvote.h b/src/or/dirvote.h index b3feeff..6211218 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -96,7 +96,8 @@ networkstatus_t * dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, authority_cert_t *cert); -microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method); +microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, + int consensus_method); ssize_t dirvote_format_microdesc_vote_line(char *out, size_t out_len, const microdesc_t *md, int consensus_method_low,

1 0

[tor/master] Make AuthDirHasIPv6Connectivity a BOOL.
by nickm＠torproject.org 05 Sep '12

05 Sep '12

commit 0e53742a857b928a5b750ddd7b036e9eae2fdd9c Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Sep 5 11:41:26 2012 +0200 Make AuthDirHasIPv6Connectivity a BOOL. This is a fix of unreleased tor. It solves ticket #6770. --- doc/tor.1.txt | 5 ++--- src/or/config.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5e76105..c4fac40 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1747,13 +1747,12 @@ DIRECTORY AUTHORITY SERVER OPTIONS votes on whether to accept relays as hidden service directories. (Default: 1) -**AuthDirHasIPv6Connectivity** **0**|**1**|**auto**:: +**AuthDirHasIPv6Connectivity** **0**|**1**:: Authoritative directories only. When set to 0, OR ports with an IPv6 address are being accepted without reachability testing. When set to 1, IPv6 OR ports are being tested just like IPv4 OR - ports. When set to auto, Tor tries to find out if the authority - relay has IPv6 connectivity or not. (Default: auto) + ports. (Default: 0) **AuthDirPublishIPv6** **0**|**1**:: diff --git a/src/or/config.c b/src/or/config.c index f21016d..949d1a2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -204,7 +204,7 @@ static config_var_t _option_vars[] = { V(AuthDirListBadExits, BOOL, "0"), V(AuthDirMaxServersPerAddr, UINT, "2"), V(AuthDirMaxServersPerAuthAddr,UINT, "5"), - V(AuthDirHasIPv6Connectivity, AUTOBOOL, "auto"), + V(AuthDirHasIPv6Connectivity, BOOL, "0"), V(AuthDirPublishIPv6, BOOL, "0"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"),

1 0

[tor/master] Merge remote-tracking branch 'linus/bug6770_3'
by nickm＠torproject.org 05 Sep '12

05 Sep '12

commit 116c8409ba0e304306ee98a0ebb15450f130fae2 Merge: f7c97cd 0e53742 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 11:35:26 2012 -0400 Merge remote-tracking branch 'linus/bug6770_3' Conflicts: doc/tor.1.txt src/or/config.c doc/tor.1.txt | 11 +++++------ src/or/config.c | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --cc doc/tor.1.txt index 93bde59,c4fac40..9a8de25 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -1747,13 -1747,19 +1747,12 @@@ DIRECTORY AUTHORITY SERVER OPTION votes on whether to accept relays as hidden service directories. (Default: 1) - **AuthDirHasIPv6Connectivity** **0**|**1**|**auto**:: - - Authoritative directories only. When set to 1, IPv6 OR ports are - being tested for reachability and voted on. When set to auto, Tor - tries to find out if the authority relay has IPv6 connectivity or - not. (Default: auto) + **AuthDirHasIPv6Connectivity** **0**|**1**:: - + Authoritative directories only. When set to 0, OR ports with an + IPv6 address are being accepted without reachability testing. + When set to 1, IPv6 OR ports are being tested just like IPv4 OR + ports. (Default: 0) -**AuthDirPublishIPv6** **0**|**1**:: - - Authoritative directories only. When set to 0, Tor will not - include IPv6 OR ports in votes. When set to 1, Tor will vote for - IPv6 OR ports. (Default: 0). - HIDDEN SERVICE OPTIONS ---------------------- diff --cc src/or/config.c index 8c41c7f,949d1a2..6027668 --- a/src/or/config.c +++ b/src/or/config.c @@@ -204,7 -204,8 +204,7 @@@ static config_var_t _option_vars[] = V(AuthDirListBadExits, BOOL, "0"), V(AuthDirMaxServersPerAddr, UINT, "2"), V(AuthDirMaxServersPerAuthAddr,UINT, "5"), - V(AuthDirHasIPv6Connectivity, AUTOBOOL, "auto"), - V(AuthDirHasIPv6Connectivity, BOOL, "0"), - V(AuthDirPublishIPv6, BOOL, "0"), ++ V(AuthDirHasIPv6Connectivity, AUTOBOOL, "0"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"),

1 0

[tor/master] Remove AuthDirPublishIPv6 and let AuthDirHasIPv6Connectivity fill its function.
by nickm＠torproject.org 05 Sep '12

05 Sep '12

commit f7c97cd40b92084164952dadf3dfeb6164aa6826 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Sep 5 13:35:39 2012 +0200 Remove AuthDirPublishIPv6 and let AuthDirHasIPv6Connectivity fill its function. See #4771 for rationale. Note that this patch does not take suggested changes in #4470 into account and keeps treating AuthDirHasIPv6Connectivity as an AUTOBOOL. Thus, bug fixes for that are included here as well. This is a fix on master, unreleased as of now. --- doc/tor.1.txt | 15 ++++----------- src/or/config.c | 1 - src/or/dirserv.c | 12 +++++------- src/or/or.h | 1 - 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5e76105..93bde59 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1749,17 +1749,10 @@ DIRECTORY AUTHORITY SERVER OPTIONS **AuthDirHasIPv6Connectivity** **0**|**1**|**auto**:: - Authoritative directories only. When set to 0, OR ports with an - IPv6 address are being accepted without reachability testing. - When set to 1, IPv6 OR ports are being tested just like IPv4 OR - ports. When set to auto, Tor tries to find out if the authority - relay has IPv6 connectivity or not. (Default: auto) - -**AuthDirPublishIPv6** **0**|**1**:: - - Authoritative directories only. When set to 0, Tor will not - include IPv6 OR ports in votes. When set to 1, Tor will vote for - IPv6 OR ports. (Default: 0). + Authoritative directories only. When set to 1, IPv6 OR ports are + being tested for reachability and voted on. When set to auto, Tor + tries to find out if the authority relay has IPv6 connectivity or + not. (Default: auto) HIDDEN SERVICE OPTIONS ---------------------- diff --git a/src/or/config.c b/src/or/config.c index f21016d..8c41c7f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -205,7 +205,6 @@ static config_var_t _option_vars[] = { V(AuthDirMaxServersPerAddr, UINT, "2"), V(AuthDirMaxServersPerAuthAddr,UINT, "5"), V(AuthDirHasIPv6Connectivity, AUTOBOOL, "auto"), - V(AuthDirPublishIPv6, BOOL, "0"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"), diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f229e59..086db03 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1017,7 +1017,7 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now) IPv6 OR port since that'd kill all dual stack relays until a majority of the dir auths have IPv6 connectivity. */ answer = (now < node->last_reachable + REACHABLE_TIMEOUT && - (options->AuthDirHasIPv6Connectivity == 0 || + (options->AuthDirHasIPv6Connectivity != 1 || tor_addr_is_null(&router->ipv6_addr) || now < node->last_reachable6 + REACHABLE_TIMEOUT)); } @@ -2495,13 +2495,11 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, strlcpy(rs->nickname, ri->nickname, sizeof(rs->nickname)); rs->or_port = ri->or_port; rs->dir_port = ri->dir_port; - if (options->AuthDirPublishIPv6 == 1 && + if (options->AuthDirHasIPv6Connectivity == 1 && !tor_addr_is_null(&ri->ipv6_addr) && - (options->AuthDirHasIPv6Connectivity == 0 || - node->last_reachable6 >= now - REACHABLE_TIMEOUT)) { - /* We're configured for publishing IPv6 OR ports. There's an IPv6 - OR port and it's reachable (or we know that we're not on IPv6) - so copy it to the routerstatus. */ + node->last_reachable6 >= now - REACHABLE_TIMEOUT) { + /* We're configured as having IPv6 connectivity. There's an IPv6 + OR port and it's reachable so copy it to the routerstatus. */ tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); rs->ipv6_orport = ri->ipv6_orport; } diff --git a/src/or/or.h b/src/or/or.h index 4bf99e2..0b321fd 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3324,7 +3324,6 @@ typedef struct { * number of servers per IP address shared * with an authority. */ int AuthDirHasIPv6Connectivity; /**< Autoboolean: are we on IPv6? */ - int AuthDirPublishIPv6; /**< Boolean: should we list IPv6 OR ports? */ /** If non-zero, always vote the Fast flag for any relay advertising * this amount of capacity or more. */

1 0