commit cbcff6759d98928d9d252aaf6268f2f679f8b00e Merge: f248a4a38 5368eaf62 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 8 10:10:52 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug22286 | 3 +++ src/common/compress.h | 2 +- src/common/compress_lzma.c | 10 ++++++++-- src/common/compress_zstd.c | 16 ++++++++++++++-- src/test/test_util.c | 7 +++++++ 5 files changed, 33 insertions(+), 5 deletions(-)