[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit 7ef22d0bf04f1b703e8d01b7d172bc0b82e0257d
Merge: 61d0f65cf 1a26c6be8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 20 09:45:07 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23568           | 4 ++++
 src/common/compress_zstd.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)