[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit 6230dfaf14bb6b92a5afaa8e81d00da4f0805955
Merge: f4e51990b 7fff99110
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:18:57 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug26272           | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --cc src/common/compress_zstd.c
index 4024f5594,193a0289f..316a3fb41
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@@ -18,15 -18,10 +18,17 @@@
  #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
+ DISABLE_GCC_WARNING(unused-const-variable)
  #include <zstd.h>
+ ENABLE_GCC_WARNING(unused-const-variable)
  #endif
  
  /** Total number of bytes allocated for Zstandard state. */