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

[nickm at torproject.org]

commit 8b5b3b5fb45cccd9349243a2c546ca1419aa8c15
Merge: 514136009 30a98c765
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 12:54:41 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22927           |  6 ++++++
 src/common/compress_zstd.c | 29 +++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)