sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.1' into release-0.3.1

This commit is contained in:
Nick Mathewson 2017-09-20 09:45:07 -04:00
parent 61d0f65cf0 1a26c6be8b
commit 7ef22d0bf0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug23568 Normal file
View File

@ -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.

8
src/common/compress_zstd.c
View File

@ -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