[tor-commits] [tor/master] Merge branch 'unified_compress_squashed'

[nickm at torproject.org]

commit 49868340f7346a7c30603b21d580a3bb54701b0a
Merge: 232c9e1 49a5b50
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 25 10:51:13 2017 -0400

    Merge branch 'unified_compress_squashed'

 src/common/compress.c      | 182 ++++++++++++++++++++++------
 src/common/compress.h      |   4 +-
 src/common/compress_lzma.c | 291 +--------------------------------------------
 src/common/compress_lzma.h |  10 --
 src/common/compress_zlib.c | 265 ++---------------------------------------
 src/common/compress_zlib.h |  10 --
 src/common/compress_zstd.c | 284 +------------------------------------------
 src/common/compress_zstd.h |  10 --
 src/test/test_util.c       |   2 +-
 9 files changed, 160 insertions(+), 898 deletions(-)