commit 30a98c765f850c76333fe2890706ea1fa2ad1f79 Merge: d068f3359 2ae51ed5e Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 12:54:37 2017 -0400

Merge branch 'bug22927_031' into maint-0.3.1

changes/bug22927 | 6 ++++++ src/common/compress_zstd.c | 29 +++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-)