torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bug33195_master' into ticket33280_master

Browse Source 
Conflicts:
* Keep the changes from ticket33280_master
This commit is contained in:
teor
2020-02-17 13:46:09 +10:00
parent 25ecdf1409 c34c101212
commit 334469cc39
7 changed files with 338 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_util.c
+2 -2
View File
@@ -1947,7 +1947,7 @@ test_util_expand_filename(void *arg)
done:
tor_free(str);
}
#endif /* !defined(_WIN32) */
#endif /* !defined(DISABLE_PWDB_TESTS) */
/** Test tor_escape_str_for_pt_args(). */
static void
@@ -5763,7 +5763,7 @@ test_util_pwdb(void *arg)
tor_free(dir);
teardown_capture_of_logs();
}
#endif /* !(defined(_WIN32) || defined (__ANDROID__)) */
#endif /* !defined(DISABLE_PWDB_TESTS) */
static void
test_util_calloc_check(void *arg)