Merge branch 'maint-0.2.8'

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,

src/test/test_dir.c

@@ -4214,7 +4214,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),