commit 4837421d7cb6bcc52d5ffd09527ac786759b3b0a Merge: d6dd05f 0672b33 Author: Nick Mathewson nickm@torproject.org Date: Mon May 1 14:22:49 2017 -0400

Merge remote-tracking branch 'ahf/bugs/21665'

src/common/compress.c | 4 ++-- src/common/compress_lzma.c | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)