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

[nickm at torproject.org]

commit b86c2c178d0545b7afeccfd2ac88ba8ea555d233
Merge: 086459091 d84581a3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:18:56 2018 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26272           | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)