diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-19 08:29:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-19 08:29:58 -0400 |
| commit | a7a44f2db0b6732ed53a24186dc09eea50296a20 (patch) | |
| tree | dfa6b1b6786798c65959840ec86ca2e9de472594 | |
| parent | d718c717a67051cb1da2a1f80c70401d0d10b374 (diff) | |
| parent | 7c7d990704219ff1033dc9dc257378757ad7cecf (diff) | |
| download | tor-a7a44f2db0b6732ed53a24186dc09eea50296a20.tar.gz tor-a7a44f2db0b6732ed53a24186dc09eea50296a20.zip | |
Merge branch 'maint-0.2.8'
| -rw-r--r-- | changes/bug18809 | 2 | ||||
| -rw-r--r-- | src/test/test_dir.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changes/bug18809 b/changes/bug18809 index 6ee50887a0..94e6369b40 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, diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 22f48e8091..18c584f01d 100644 --- a/src/test/test_dir.c +++ b/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), |