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

[tor/master] Merge remote-tracking branch 'teor/ticket22437'
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 2bfc490c1e03ec188dabc22aa78603f3fba34ad6 Merge: 80a22f536 d7d8d2c20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:30:33 2017 -0400 Merge remote-tracking branch 'teor/ticket22437' src/test/include.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[tor/master] Add a changes file for 22437.
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 4ace1b96ac2050e2d7c237af6fbf880f38be76bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:31:57 2017 -0400 Add a changes file for 22437. --- changes/ticket22437 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket22437 b/changes/ticket22437 new file mode 100644 index 000000000..8e4c9630c --- /dev/null +++ b/changes/ticket22437 @@ -0,0 +1,4 @@ + o Testing: + - The default chutney network tests now include tests for the + v3 hidden service design. Make sure you have the latest + version of chutney if you want to run these. Closes ticket 22437.

1 0

[tor/master] Whoops -- options_trial_assign() was calling get_options() in #22281
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 5bb4e0c88d3fc94459eec73e15b1ce8205768fbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 08:40:13 2017 -0400 Whoops -- options_trial_assign() was calling get_options() in #22281 So, move the get_options() call. --- src/or/config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index aebca907f..9d6cc9a26 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2313,17 +2313,18 @@ options_trial_assign(config_line_t *list, unsigned flags, char **msg) } setopt_err_t rv; + or_options_t *cur_options = get_options_mutable(); in_option_validation = 1; - if (options_validate(get_options_mutable(), trial_options, + if (options_validate(cur_options, trial_options, global_default_options, 1, msg) < 0) { or_options_free(trial_options); rv = SETOPT_ERR_PARSE; /*XXX make this a separate return value. */ goto done; } - if (options_transition_allowed(get_options(), trial_options, msg) < 0) { + if (options_transition_allowed(cur_options, trial_options, msg) < 0) { or_options_free(trial_options); rv = SETOPT_ERR_TRANSITION; goto done;

1 0

[tor/master] Merge branch 'bug23479'
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 80a22f536a96de45441cd55874634766b10aa311 Merge: 767372f6a 5bb4e0c88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:24:54 2017 -0400 Merge branch 'bug23479' src/or/config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.0] One more implicit fallthrough warning to fix on GCC 7
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit bac160b4e079398d82a6dda13111fc1f3407d837 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:22:50 2017 -0400 One more implicit fallthrough warning to fix on GCC 7 --- src/common/torgzip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 3353f0ef6..c44399aa7 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -181,6 +181,7 @@ tor_gzip_compress(char **out, size_t *out_len, /* In case zlib doesn't work as I think .... */ if (stream->avail_out >= stream->avail_in+16) break; + /* Falls through. */ case Z_BUF_ERROR: offset = stream->next_out - ((unsigned char*)*out); old_size = out_size; @@ -319,6 +320,7 @@ tor_gzip_uncompress(char **out, size_t *out_len, /* In case zlib doesn't work as I think.... */ if (stream->avail_out >= stream->avail_in+16) break; + /* Falls through. */ case Z_BUF_ERROR: if (stream->avail_out > 0) { log_fn(protocol_warn_level, LD_PROTOCOL,

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 0729ba2868c42bdd34fb305d858cf2d85030e457 Merge: 2b26815e0 bac160b4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:23:57 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/common/torgzip.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 070e82a02d89f06ab83daa1a3186258f5205dde1 Merge: 9c8b07c5e 0729ba286 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:23:57 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 src/common/torgzip.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 469189d84a9b968be7a296c42ac540bf31824124 Merge: eaa8224ce 0729ba286 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:24:20 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid torgzip.c change, since torgzip has been replaced.

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 0729ba2868c42bdd34fb305d858cf2d85030e457 Merge: 2b26815e0 bac160b4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:23:57 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/common/torgzip.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 931b2dbae537a4688a6c71deeb1ea0489efc456a Merge: 77a848b9d 469189d84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:24:33 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1

1 0