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

[nickm at torproject.org]

commit 15d7f24c57828b94596ccfd97081840b920c2336
Merge: dbf57ecf3 a8bdb851e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 30 08:17:24 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26785           | 4 ++++
 configure.ac               | 3 +++
 src/common/compress_zstd.c | 4 ++++
 3 files changed, 11 insertions(+)