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

[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

[tor/release-0.3.1] 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/maint-0.2.9] 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/maint-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/maint-0.3.1] 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/maint-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/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 12 Sep '17

12 Sep '17

commit 767372f6a0829780f57096cfed9345f636becd37 Merge: 6e4967ef0 469189d84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 09:24:34 2017 -0400 Merge branch 'maint-0.3.1'

1 0

[tor/maint-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/master] 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/maint-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