June 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit 9ff769c4921f77bff0e0b7b76c53d4e5b1af7659 Merge: 3cca9a103 7fff99110 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit 5d8a927aa35c01c59dcf137827db27b92d034498 Merge: 74ac463e7 d84581a3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit 7fff99110b6d00dbd438ce9182474f045f996f3f Merge: 6dca180ae 5d8a927aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

1 0

[tor/master] Silence -Wbad-function-cast warning (when DEBUG_SMARTLIST is on)
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit 9876575d2c14ced3febca0c1a65808585fe8504d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 16:45:09 2018 +0300 Silence -Wbad-function-cast warning (when DEBUG_SMARTLIST is on) --- changes/bug26283 | 4 ++++ src/or/routerlist.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug26283 b/changes/bug26283 new file mode 100644 index 000000000..5ec856af8 --- /dev/null +++ b/changes/bug26283 @@ -0,0 +1,4 @@ + o Minor bugfixes (C correctness): + - Avoid casting return value of smartlist_len() to double as + compiler does not like it when -Wbad-function-cast is on. + Fixes bug 26283; bugfix on 0.2.4.10-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 7603eb3ec..8788dc019 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2764,7 +2764,7 @@ frac_nodes_with_descriptors(const smartlist_t *sl, if (node_has_any_descriptor(node)) n_with_descs++; }); - return ((double)n_with_descs) / (double)smartlist_len(sl); + return ((double)n_with_descs) / smartlist_len(sl); } present = 0.0;

1 0

[tor/master] Merge remote-tracking branch 'rl1987/bug26283'
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit f4e51990b911161b26138f40f3d370eeafd9ac2f Merge: b2470f514 9876575d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 12 08:17:48 2018 -0400 Merge remote-tracking branch 'rl1987/bug26283' changes/bug26283 | 4 ++++ src/or/routerlist.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit 19f386852333a6de5fbf9bcb3a4415b3bb135b4d Merge: 1ef8023e0 ae540569c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 12 08:11:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-06-07 | 4 + src/config/geoip | 5848 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 810 ++++++- 3 files changed, 4354 insertions(+), 2308 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit 3cca9a103d8d1e6afa520ce45b9e08f4f5a0d987 Merge: 79c56a6e3 6dca180ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 12 08:11:20 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/geoip-2018-06-07 | 4 + src/config/geoip | 5848 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 810 ++++++- 3 files changed, 4354 insertions(+), 2308 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit 6dca180ae9abcd5bd12c6aa4dda8d3e19017a6cb Merge: a14112743 74ac463e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 12 08:11:20 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-06-07 | 4 + src/config/geoip | 5848 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 810 ++++++- 3 files changed, 4354 insertions(+), 2308 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit 74ac463e7fb806e5abf48be788daf03c40e930ad Merge: dd63033fc 19f386852 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 12 08:11:20 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-06-07 | 4 + src/config/geoip | 5848 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 810 ++++++- 3 files changed, 4354 insertions(+), 2308 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 12 Jun '18

12 Jun '18

commit 74ac463e7fb806e5abf48be788daf03c40e930ad Merge: dd63033fc 19f386852 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 12 08:11:20 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-06-07 | 4 + src/config/geoip | 5848 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 810 ++++++- 3 files changed, 4354 insertions(+), 2308 deletions(-)

1 0