commit be0557f759a804b5d50cdc775af67aeb1873b719 Merge: d92a56c e42c204 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Apr 26 14:20:01 2017 -0400 Merge remote-tracking branch 'ahf/bugs/22066' src/common/compress.c | 39 ++++++++++++++++-------- src/common/compress_lzma.c | 42 +++++++++++++++++++++----- src/common/compress_zstd.c | 75 ++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 126 insertions(+), 30 deletions(-)