commit 6716cd090a7dad38edfec54b159d66941329356e Merge: 2b12e2679 15d7f24c5 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 30 08:17:25 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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