commit 584ab1f29b05b6cd0c63c16668b1c260a957656b Merge: 465448e 3836d94 Author: Nick Mathewson nickm@torproject.org Date: Tue May 2 08:33:35 2017 -0400

Merge branch 'compress_none_v2_squashed'

src/common/compress.c | 15 +++++++++++-- src/common/compress_none.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ src/common/compress_none.h | 20 +++++++++++++++++ src/common/include.am | 4 +++- src/test/test_buffers.c | 8 ++++++- src/test/test_util.c | 29 +++++++++++++++++++------ 6 files changed, 118 insertions(+), 11 deletions(-)

diff --cc src/test/test_buffers.c index c0e222b,38b0824..07114a8 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@@ -854,7 -858,9 +858,9 @@@ struct testcase_t buffer_tests[] = { "compress/zstd", test_buffers_compress, TT_FORK, &passthrough_setup, (char*)"x-zstd" }, { "compress/lzma", test_buffers_compress, TT_FORK, - &passthrough_setup, (char*)"x-lzma" }, + &passthrough_setup, (char*)"x-tor-lzma" }, + { "compress/none", test_buffers_compress, TT_FORK, + &passthrough_setup, (char*)"identity" },

END_OF_TESTCASES }; diff --cc src/test/test_util.c index 022f29c,56e39a3..b3f8ecd --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -5753,8 -5767,9 +5767,9 @@@ struct testcase_t util_tests[] = UTIL_LEGACY(pow2), COMPRESS(zlib, "deflate"), COMPRESS(gzip, "gzip"), - COMPRESS(lzma, "x-lzma"), + COMPRESS(lzma, "x-tor-lzma"), COMPRESS(zstd, "x-zstd"), + COMPRESS(none, "identity"), UTIL_TEST(gzip_compression_bomb, TT_FORK), UTIL_LEGACY(datadir), UTIL_LEGACY(memarea),