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

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit bd440537169728a626c3d38c2ad14d800898f617 Merge: 0e2f188 ea59783 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 09:29:37 2016 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-august2016 | 4 + changes/geoip-july2016 | 4 + changes/geoip-november2016 | 4 + changes/geoip-october2016 | 4 + changes/geoip-september2016 | 4 + src/config/geoip | 52582 ++++++++++++++++++++++++++++++------------ src/config/geoip6 | 5261 +++-- 7 files changed, 41088 insertions(+), 16775 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit db2571be619530389c7ca3066cfc86b32cfc7578 Merge: 304d8f3 ea59783 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 09:29:54 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-november2016 | 4 + src/config/geoip | 4025 ++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2490 ++++++++++----------------- 3 files changed, 3407 insertions(+), 3112 deletions(-)

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit db2571be619530389c7ca3066cfc86b32cfc7578 Merge: 304d8f3 ea59783 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 09:29:54 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-november2016 | 4 + src/config/geoip | 4025 ++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2490 ++++++++++----------------- 3 files changed, 3407 insertions(+), 3112 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit f5fdf188b9c2e218e89f55e4fb26fcd3b2abe44b Merge: ec718aa 6c2174d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 09:30:42 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-november2016 | 4 + src/config/geoip | 4025 ++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2490 ++++++++++----------------- 3 files changed, 3407 insertions(+), 3112 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit c8069de2104d35941a2b015338970227cb853a22 Merge: c217d6d f5fdf18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 09:30:50 2016 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 changes/geoip-november2016 | 4 + src/config/geoip | 4025 ++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2490 ++++++++++----------------- 3 files changed, 3407 insertions(+), 3112 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit f5fdf188b9c2e218e89f55e4fb26fcd3b2abe44b Merge: ec718aa 6c2174d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 09:30:42 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-november2016 | 4 + src/config/geoip | 4025 ++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2490 ++++++++++----------------- 3 files changed, 3407 insertions(+), 3112 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 6c2174d44d01b4c231befe9de5ce2ffb042cc65d Merge: 12a7298 db2571b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 09:30:16 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-november2016 | 4 + src/config/geoip | 4025 ++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2490 ++++++++++----------------- 3 files changed, 3407 insertions(+), 3112 deletions(-)

1 0

[tor/master] Allow infinitely long delays in exponential-backoff downloads
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 858867a31a31b7a0065481b1f5ad108f02ab337a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 6 20:14:34 2016 -0500 Allow infinitely long delays in exponential-backoff downloads It's only safe to remove the failure limit (per 20536) if we are in fact waiting a bit longer each time we try to download. Fixes bug 20534; bugfix on 0.2.9.1-alpha. --- changes/bug20534 | 6 ++++++ src/or/directory.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug20534 b/changes/bug20534 new file mode 100644 index 0000000..1ffa1f3 --- /dev/null +++ b/changes/bug20534 @@ -0,0 +1,6 @@ + o Minor bugfixes (directory download scheduling): + - Remove the maximum delay on exponential-backoff scheduling. + Since we now allow an infinite number of failures (see ticket + 20536), we must now allow the time to grow longer on each failure. + Fixes bug 20534; bugfix on 0.2.9.1-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index 24490b7..5fc1572 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3770,7 +3770,10 @@ find_dl_min_and_max_delay(download_status_t *dls, const or_options_t *options, const smartlist_t *schedule = find_dl_schedule(dls, options); tor_assert(schedule != NULL && smartlist_len(schedule) >= 2); *min = *((int *)(smartlist_get(schedule, 0))); - *max = *((int *)((smartlist_get(schedule, smartlist_len(schedule) - 1)))); + if (dls->backoff == DL_SCHED_DETERMINISTIC) + *max = *((int *)((smartlist_get(schedule, smartlist_len(schedule) - 1)))); + else + *max = INT_MAX; } /** Advance one delay step. The algorithm is to use the previous delay to

1 0

[tor/master] Merge branch '20499_part1_029_squashed', remote-tracking branches 'teor/bug20591_029' and 'teor/bug20533_029' into maint-0.2.9
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit d82ffb77f3345497480a074d32f8350c481902df Merge: ce8a1e2 858867a 1bb28ce e819d42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 09:20:13 2016 -0500 Merge branch '20499_part1_029_squashed', remote-tracking branches 'teor/bug20591_029' and 'teor/bug20533_029' into maint-0.2.9 changes/bug20533 | 7 +++++++ changes/bug20534 | 6 ++++++ changes/bug20536 | 6 ++++++ changes/bug20587 | 6 ++++++ changes/bug20591 | 3 +++ src/or/directory.c | 11 +++++++---- src/or/directory.h | 12 +++++++++--- src/or/networkstatus.c | 19 ++++++++++++++----- 8 files changed, 58 insertions(+), 12 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit db2571be619530389c7ca3066cfc86b32cfc7578 Merge: 304d8f3 ea59783 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 09:29:54 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-november2016 | 4 + src/config/geoip | 4025 ++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2490 ++++++++++----------------- 3 files changed, 3407 insertions(+), 3112 deletions(-)

1 0