commit a1dd8afc16ebeacceb5b4093ef01e2ad8f21ad6c Merge: 066a15af6 a03488954 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 15 20:28:07 2018 -0500

Merge branch '25162_zstd_static'

changes/ticket25162 | 6 +++ configure.ac | 6 +++ src/common/compress.c | 10 +++++ src/common/compress.h | 1 + src/common/compress_zstd.c | 106 ++++++++++++++++++++++++++++++++++++++++----- src/common/compress_zstd.h | 7 +++ src/or/main.c | 2 + src/test/test_util.c | 43 ++++++++++++++++-- 8 files changed, 167 insertions(+), 14 deletions(-)