mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.2.8'

Browse source
This commit is contained in:
Nick Mathewson 2016-05-19 08:29:58 -04:00
commit a7a44f2db0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changes/bug18809
View file

@ -7,7 +7,7 @@
- Fix some edge cases where consensus download connections - Fix some edge cases where consensus download connections
may not have been closed, even though they were not needed. may not have been closed, even though they were not needed.
- Make relays retry consensus downloads the correct number of - 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, - Stop downloading consensuses when we have a consensus,
even if we don't have all the certificates for it yet. even if we don't have all the certificates for it yet.
Closes ticket 18943, bugfix on #4483 in 0.2.8.1-alpha, Closes ticket 18943, bugfix on #4483 in 0.2.8.1-alpha,

2
src/test/test_dir.c
View file

@ -4214,7 +4214,7 @@ test_dir_find_dl_schedule(void* data)
/* where arg is a string constant */ /* where arg is a string constant */
#define DIR_ARG(name,flags,arg) \ #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[] = { struct testcase_t dir_tests[] = {
DIR_LEGACY(nicknames), DIR_LEGACY(nicknames),