Merge branch 'maint-0.3.3'

diff --cc src/common/compress_zstd.c
index 4024f5594dfed402bbbd9c8ce5a3f26b40826c55,193a0289f0cc623af0ad84199e145c7af0fe6ac9..316a3fb417d13d316152fb7af08164eca6c56534
--- 1/src/common/compress_zstd.c
--- 2/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. */