commit d102e9c2e4ab5dfca0c03f7b4e27431d069338fd Merge: 977821e59 15d7f24c5 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 30 08:17:25 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

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

diff --cc src/common/compress_zstd.c index 316a3fb41,b9f9f1f07..dc8b4d621 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@@ -18,18 -18,15 +18,22 @@@ #include "compress.h" #include "compress_zstd.h"

+#ifdef ENABLE_ZSTD_ADVANCED_APIS +/* This is a lie, but we make sure it doesn't get us in trouble by wrapping + * all invocations of zstd's static-only functions in a check to make sure + * that the compile-time version matches the run-time version. */ +#define ZSTD_STATIC_LINKING_ONLY +#endif + #ifdef HAVE_ZSTD + #ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE DISABLE_GCC_WARNING(unused-const-variable) + #endif #include <zstd.h> + #ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE ENABLE_GCC_WARNING(unused-const-variable) #endif + #endif

/** Total number of bytes allocated for Zstandard state. */ static atomic_counter_t total_zstd_allocation;