aboutsummaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-10 16:27:15 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-10 16:27:15 -0400
commita868b84599b7591442f40b40b0187c83e8f999b1 (patch)
treeb2aa396818659c5bff00f6ece6345957b1d4dbc8 /src/or/networkstatus.c
parentd792d2a14ddb7d2ff62dea8ed7d15416b1254348 (diff)
parent8f5da804da5a8cd486478f8bf2fea1f47a025225 (diff)
downloadtor-a868b84599b7591442f40b40b0187c83e8f999b1.tar.gz
tor-a868b84599b7591442f40b40b0187c83e8f999b1.zip
Merge branch 'maint-0.2.9' into 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 508cf6c5b6..26c388cc76 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2449,11 +2449,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;