Merge branch 'maint-0.3.1'

diff --cc src/common/compress_zstd.c
index 58ec28d001a6b161630a9157263de221b4df0030,63e92ed22da62bc1d11871f5c965a9ebad9173af..c1cdaf17ad09ee373c47e35df11623b7a604b341
--- 1/src/common/compress_zstd.c
--- 2/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@@ -62,15 -62,15 +62,15 @@@ tor_zstd_get_version_str(void
  
    version_number = ZSTD_versionNumber();
    tor_snprintf(version_str, sizeof(version_str),
-                "%lu.%lu.%lu",
-                version_number / 10000 % 100,
-                version_number / 100 % 100,
-                version_number % 100);
+                "%d.%d.%d",
+                (int) version_number / 10000 % 100,
+                (int) version_number / 100 % 100,
+                (int) version_number % 100);
  
    return version_str;
 -#else
 +#else /* !(defined(HAVE_ZSTD)) */
    return NULL;
 -#endif
 +#endif /* defined(HAVE_ZSTD) */
  }
  
  /** Return a string representation of the version of the version of libzstd