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

[nickm at torproject.org]

commit 7fff99110b6d00dbd438ce9182474f045f996f3f
Merge: 6dca180ae 5d8a927aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:18:56 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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