tor

commit ff0aabc35d3688410846d7fee1a0dc9220b189ef
parent 427ae164f33aad6004290fc407d53ab3315b399a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 20 Sep 2017 09:45:07 -0400

Merge branch 'maint-0.3.1'

Diffstat:
A
changes/bug23568
 | 
4
++++
M
src/common/compress_zstd.c
 | 
8
++++----

2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/changes/bug23568 b/changes/bug23568
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - Fix a compilation warning when building with zstd support
+      on 32-bit platforms. Fixes bug 23568; bugfix on 0.3.1.1-alpha.
+      Found and fixed by Andreas Stieger.
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
@@ -62,10 +62,10 @@ 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 /* !(defined(HAVE_ZSTD)) */