torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'prop275_minimal_029' into maint-0.2.9

Browse Source
This commit is contained in:
Nick Mathewson
2017-05-10 16:26:45 -04:00
parent 0df22e8f5f 85cf6dcba3
commit 8f5da804da
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/networkstatus.c
-5
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;