[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit a868b84599b7591442f40b40b0187c83e8f999b1
Merge: d792d2a 8f5da80
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 10 16:27:15 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/prop275-minimal | 9 +++++++++
 src/or/networkstatus.c  | 5 -----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --cc src/or/networkstatus.c
index 508cf6c,991cf80..26c388c
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@@ -2444,16 -2355,11 +2444,11 @@@ in
  client_would_use_router(const routerstatus_t *rs, time_t now,
                          const or_options_t *options)
  {
 -  if (!rs->is_flagged_running && !options->FetchUselessDescriptors) {
 +  if (!rs->is_flagged_running) {
      /* If we had this router descriptor, we wouldn't even bother using it.
 -     * But, if we want to have a complete list, fetch it anyway. */
 +     * (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;