From: teor <teor2345@gmail.com>
Date: Wed, 30 Nov 2016 00:43:04 +0000 (+1100)
Subject: Remove an unneccessary FetchUselessDescriptors check in client_would_use_router
X-Git-Tag: tor-0.3.0.1-alpha~100^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e061cf4d1d7e9d8533cde936f0904d4f7b877746;p=thirdparty%2Ftor.git

Remove an unneccessary FetchUselessDescriptors check in client_would_use_router
---

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 10157c6170..bfb36413ce 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2407,9 +2407,9 @@ int
 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