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

[nickm at torproject.org]

commit ff0aabc35d3688410846d7fee1a0dc9220b189ef
Merge: 427ae164f 1a26c6be8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 20 09:45:07 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug23568           | 4 ++++
 src/common/compress_zstd.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --cc src/common/compress_zstd.c
index 58ec28d00,63e92ed22..c1cdaf17a
--- 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