[tor-commits] [tor/master] Merge branch 'bug22502_redux_031' into maint-0.3.1

[nickm at torproject.org]

commit e51e7bd38b758d3f71a2e31184dde3771f897af8
Merge: c999e84 782eb02
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 20 20:27:48 2017 -0400

    Merge branch 'bug22502_redux_031' into maint-0.3.1

 changes/bug22669      |  4 ++++
 src/common/compress.c |  8 +------
 src/or/directory.c    | 25 ++++++++++++++++++--
 src/test/test_util.c  | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 9 deletions(-)

diff --cc src/common/compress.c
index 46aa1d5,c6c3897..7926faa
--- a/src/common/compress.c
+++ b/src/common/compress.c
@@@ -146,17 -146,11 +146,11 @@@ tor_compress_impl(int compress
                   "Unexpected %s while %scompressing",
                   complete_only?"end of input":"result",
                   compress?"":"de");
 -          log_debug(LD_GENERAL, "method: %d level: %d at len: %zd",
 -                    method, compression_level, in_len);
 +          log_debug(LD_GENERAL, "method: %d level: %d at len: %lu",
 +                    method, compression_level, (unsigned long)in_len);
            goto err;
          } else {
-           if (in_len != 0) {
-             log_fn(protocol_warn_level, LD_PROTOCOL,
-                    "Unexpected extra input while decompressing");
-             log_debug(LD_GENERAL, "method: %d level: %d at len: %lu",
-                       method, compression_level, (unsigned long)in_len);
-             goto err;
-           } else {
+           if (in_len == 0) {
              goto done;
            }
          }