From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Sep 2017 13:45:07 +0000 (-0400)
Subject: Merge branch 'maint-0.3.1'
X-Git-Tag: tor-0.3.2.2-alpha~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff0aabc35d3688410846d7fee1a0dc9220b189ef;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1'
---

ff0aabc35d3688410846d7fee1a0dc9220b189ef
diff --cc src/common/compress_zstd.c
index 58ec28d001,63e92ed22d..c1cdaf17ad
--- a/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