Merge branch 'bug22502_redux_031' into maint-0.3.1

diff --cc src/common/compress.c
index 46aa1d52bacea7b76e49055368decc32e84a212f,c6c3897989f026fd86e4ff3dbfd55d87e30d6922..7926faaa6090794401a8e80e17106c7fc1b5f774
--- 1/src/common/compress.c
--- 2/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;
            }
          }