[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 48a57f9815875d8c591f5660e1b7a10d478785ac
Merge: 2032b9b1b 5368eaf62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 8 10:10:52 2017 -0400

    Merge branch 'maint-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(-)