- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Revert "If we are not using BEGIN_DIR cells, don't attempt to contact hidden service directories with non-open dir port."
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit a6cc15e2aedfc370fc0328edd375a869338ee4f1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Mar 12 07:17:26 2011 -0800 Revert "If we are not using BEGIN_DIR cells, don't attempt to contact hidden service directories with non-open dir port." This reverts commit 9a7098487b2c25f36112b3521758f42621dcd6af. Conflicts: ChangeLog (left unchanged by this commit) --- src/or/routerlist.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index fb8fb88..5e9c82a 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5335,7 +5335,6 @@ hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, { int start, found, n_added = 0, i; networkstatus_t *c = networkstatus_get_latest_consensus(); - int use_begindir = get_options()->TunnelDirConns; if (!c || !smartlist_len(c->routerstatus_list)) { log_warn(LD_REND, "We don't have a consensus, so we can't perform v2 " "rendezvous operations."); @@ -5348,14 +5347,9 @@ hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, do { routerstatus_t *r = smartlist_get(c->routerstatus_list, i); if (r->is_hs_dir) { - if (r->dir_port || use_begindir) - smartlist_add(responsible_dirs, r); - else - log_info(LD_REND, "Not adding router '%s' to list of responsible " - "hidden service directories, because we have no way of " - "reaching it.", r->nickname); + smartlist_add(responsible_dirs, r); if (++n_added == REND_NUMBER_OF_CONSECUTIVE_REPLICAS) - break; + return 0; } if (++i == smartlist_len(c->routerstatus_list)) i = 0;

1 0

[tor/maint-0.2.2] Add changes file for previous commit
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit eb50e3d6bf6eb9880f92050cb0db849394bd6cb0 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Mar 12 07:29:04 2011 -0800 Add changes file for previous commit --- changes/bug2722 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/bug2722 b/changes/bug2722 new file mode 100644 index 0000000..ed132fc --- /dev/null +++ b/changes/bug2722 @@ -0,0 +1,11 @@ + o Minor bugfixes + - Ignore the TunnelDirConns option when determining which HSDir + relays are responsible for a hidden service descriptor ID. + Currently, clients and hidden services with TunnelDirConns off + will skip over HSDir relays which do not advertise a DirPort + when making a list of HSDirs responsible for a descriptor ID, + even though they would never try to use a HSDir's DirPort to + upload or fetch a hidden service descriptor. Fixes bug 2722; + bugfix on 0.2.1.6-alpha. + +

1 0

[tor/maint-0.2.2] Add an XXX to the DA code regarding bug 2722
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 134da2fbcf865418863bda8d4c479a20f6f6651d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 18 12:00:48 2011 -0700 Add an XXX to the DA code regarding bug 2722 --- src/or/dirserv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f65f258..525524c 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1811,6 +1811,8 @@ dirserv_thinks_router_is_hs_dir(routerinfo_t *router, time_t now) * bug 1693. In the future, once relays set wants_to_be_hs_dir * correctly, we can revert to only checking dir_port if router's * version is too old. */ + /* XXX Unfortunately, we need to keep checking dir_port until all + * *clients* suffering from bug 2722 are obsolete. */ return (router->wants_to_be_hs_dir && router->dir_port && uptime > get_options()->MinUptimeHidServDirectoryV2 && router->is_running);

1 0

[tor/master] fix a function comment
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 710227a77f3d47fec78497b0fabce13b4e3ce728 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 28 19:19:04 2011 -0400 fix a function comment --- src/or/circuitbuild.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 90572d5..fe94264 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4584,8 +4584,7 @@ find_bridge_by_digest(const char *digest) return NULL; } -/** We need to ask bridge for its server descriptor. address - * is a helpful string describing this bridge. */ +/** We need to ask bridge for its server descriptor. */ static void launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit bb8689b86480d81aa150d5f27fa830afc4de4077 Merge: f38ecd5 c122897 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:05:48 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3020 | 7 +++++++ src/or/circuitbuild.c | 3 +-- src/or/hibernate.c | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit c12289792507c8dd51c2a947f7c910c70df4dd3d Merge: 710227a 525d270 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:03:57 2011 -0400 Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2 changes/bug3020 | 7 +++++++ src/or/hibernate.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/master] Correctly check elapsed time in last hibernation period
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 525d2700dd8b6c794a69ea0be63864baeff27617 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 29 01:18:32 2011 +0200 Correctly check elapsed time in last hibernation period Fix bug 3020. --- changes/bug3020 | 7 +++++++ src/or/hibernate.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/changes/bug3020 b/changes/bug3020 new file mode 100644 index 0000000..b987161 --- /dev/null +++ b/changes/bug3020 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - When checking whether a hibernation period has fully elapsed, use + the amount of seconds we expect for that period instead of using + the new period that just started. This would cause an issue because + February is a really short month. Bugfix on 0.2.2.17-alpha; + fixes bug 3020. + diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 1878d5d..aebce4c 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -378,7 +378,8 @@ configure_accounting(time_t now) /* We are in the interval we thought we were in. Do nothing.*/ interval_end_time = start_of_accounting_period_after(interval_start_time); } else { - long duration = length_of_accounting_period_containing(now); + long duration = + length_of_accounting_period_containing(interval_start_time); double delta = ((double)(s_now - interval_start_time)) / duration; if (-0.50 <= delta && delta <= 0.50) { /* The start of the period is now a little later or earlier than we

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit c12289792507c8dd51c2a947f7c910c70df4dd3d Merge: 710227a 525d270 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:03:57 2011 -0400 Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2 changes/bug3020 | 7 +++++++ src/or/hibernate.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Correctly check elapsed time in last hibernation period
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 525d2700dd8b6c794a69ea0be63864baeff27617 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 29 01:18:32 2011 +0200 Correctly check elapsed time in last hibernation period Fix bug 3020. --- changes/bug3020 | 7 +++++++ src/or/hibernate.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/changes/bug3020 b/changes/bug3020 new file mode 100644 index 0000000..b987161 --- /dev/null +++ b/changes/bug3020 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - When checking whether a hibernation period has fully elapsed, use + the amount of seconds we expect for that period instead of using + the new period that just started. This would cause an issue because + February is a really short month. Bugfix on 0.2.2.17-alpha; + fixes bug 3020. + diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 1878d5d..aebce4c 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -378,7 +378,8 @@ configure_accounting(time_t now) /* We are in the interval we thought we were in. Do nothing.*/ interval_end_time = start_of_accounting_period_after(interval_start_time); } else { - long duration = length_of_accounting_period_containing(now); + long duration = + length_of_accounting_period_containing(interval_start_time); double delta = ((double)(s_now - interval_start_time)) / duration; if (-0.50 <= delta && delta <= 0.50) { /* The start of the period is now a little later or earlier than we

1 0

[tor/maint-0.2.2] fix a function comment
by arma＠torproject.org 28 Apr '11

28 Apr '11

commit 710227a77f3d47fec78497b0fabce13b4e3ce728 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 28 19:19:04 2011 -0400 fix a function comment --- src/or/circuitbuild.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 90572d5..fe94264 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4584,8 +4584,7 @@ find_bridge_by_digest(const char *digest) return NULL; } -/** We need to ask bridge for its server descriptor. address - * is a helpful string describing this bridge. */ +/** We need to ask bridge for its server descriptor. */ static void launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) {

1 0