From 06803c317f3865b2a365c4485618828f60bd5de9 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 19 May 2016 08:27:11 -0400 Subject: [PATCH 1/2] Fix a compilation error in test_dir.c --- src/test/test_dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index c8065270f..eca3082e4 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4213,7 +4213,7 @@ test_dir_find_dl_schedule(void* data) /* where arg is a string constant */ #define DIR_ARG(name,flags,arg) \ - { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, arg } + { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, (void*) arg } struct testcase_t dir_tests[] = { DIR_LEGACY(nicknames), From 7c7d990704219ff1033dc9dc257378757ad7cecf Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 19 May 2016 08:29:45 -0400 Subject: [PATCH 2/2] changelog typo fix --- changes/bug18809 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug18809 b/changes/bug18809 index 6ee50887a..94e6369b4 100644 --- a/changes/bug18809 +++ b/changes/bug18809 @@ -7,7 +7,7 @@ - Fix some edge cases where consensus download connections may not have been closed, even though they were not needed. - Make relays retry consensus downloads the correct number of - times, rather than the more aggresive client retry count. + times, rather than the more aggressive client retry count. - Stop downloading consensuses when we have a consensus, even if we don't have all the certificates for it yet. Closes ticket 18943, bugfix on #4483 in 0.2.8.1-alpha,