aboutsummaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-10 16:28:07 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-10 16:28:07 -0400
commit1a497dcd1e43913042ed5b11d4c9466ea1956399 (patch)
treef4f5c2e32a84cd873e693e9aa08a0f4aa201bf43 /src/or/networkstatus.c
parentee3ccd2facb2cfe863315f671c337eca72e6700c (diff)
parenta868b84599b7591442f40b40b0187c83e8f999b1 (diff)
downloadtor-1a497dcd1e43913042ed5b11d4c9466ea1956399.tar.gz
tor-1a497dcd1e43913042ed5b11d4c9466ea1956399.zip
Merge branch 'maint-0.3.0'
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r--src/or/networkstatus.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index ac5c5c526c..2b1afa3a1e 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2477,11 +2477,6 @@ client_would_use_router(const routerstatus_t *rs, time_t now,
* (Fetching and storing depends on by we_want_to_fetch_flavor().) */
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;