Merge branch 'maint-0.2.8' into release-0.2.8

This commit is contained in:
Nick Mathewson 2016-05-19 08:54:30 -04:00
commit 0a05afa96d
1 changed files with 5 additions and 3 deletions

View File

@ -3,12 +3,14 @@
when the linked connection attaches. This prevents tor when the linked connection attaches. This prevents tor
making unnecessary begindir-style connections, which are making unnecessary begindir-style connections, which are
the only directory connections tor clients make since the only directory connections tor clients make since
#18483 was merged. the fix for 18483 was merged.
- 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.
Related to fix 18809.
- Make relays retry consensus downloads the correct number of - Make relays retry consensus downloads the correct number of
times, rather than the more aggressive client retry count. times, rather than the more aggressive client retry count.
Fixes part of ticket 18809.
- 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, Fixes bug 18809; bugfix on 0.2.8.1-alpha.
patches by arma and teor. Patches by arma and teor.