commit a5c1b17e14402254ed162ca849914cb0103e49de Merge: e1e914cd4 5d8a927aa Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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