Merge branch 'maint-0.2.8'

This commit is contained in:
Nick Mathewson 2016-06-02 10:13:35 -04:00
commit b458a81cc5
2 changed files with 4 additions and 1 deletions

3
changes/bug19213 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (compilation):
- Cause the unit tests to compile correctly on mingw64 versions
that lack sscanf. Fixes bug 19213. Bugfix on 0.2.7.1-alpha.

View File

@ -4664,7 +4664,7 @@ test_util_writepid(void *arg)
contents = read_file_to_str(fname, 0, NULL);
tt_assert(contents);
int n = sscanf(contents, "%lu\n%c", &pid, &c);
int n = tor_sscanf(contents, "%lu\n%c", &pid, &c);
tt_int_op(n, OP_EQ, 1);
#ifdef _WIN32