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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.1' into maint-0.3.2

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