From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 21 Jun 2017 00:27:48 +0000 (-0400)
Subject: Merge branch 'bug22502_redux_031' into maint-0.3.1
X-Git-Tag: tor-0.3.1.4-alpha~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e51e7bd38b758d3f71a2e31184dde3771f897af8;p=thirdparty%2Ftor.git

Merge branch 'bug22502_redux_031' into maint-0.3.1
---

e51e7bd38b758d3f71a2e31184dde3771f897af8
diff --cc src/common/compress.c
index 46aa1d52ba,c6c3897989..7926faaa60
--- 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;
            }
          }