Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2017-05-10 16:26:53 -04:00
commit 0633d14b47
2 changed files with 9 additions and 5 deletions

9
changes/prop275-minimal Normal file
View File

@ -0,0 +1,9 @@
o Minor features (future-proofing):
- Tor no longer refuses to download microdescriptors or descriptors if
they are listed as "published in the future". This change will
eventually allow us to stop listing meaningful "published" dates
in microdescriptor consensuses, and thereby allow us to reduce the
resources required to download consensus diffs by over 50%.
Implements part of ticket 21642; implements part of proposal 275.

View File

@ -2360,11 +2360,6 @@ client_would_use_router(const routerstatus_t *rs, time_t now,
* But, if we want to have a complete list, fetch it anyway. */
return 0;
}
if (rs->published_on + options->TestingEstimatedDescriptorPropagationTime
> now) {
/* Most caches probably don't have this descriptor yet. */
return 0;
}
if (rs->published_on + OLD_ROUTER_DESC_MAX_AGE < now) {
/* We'd drop it immediately for being too old. */
return 0;