[tor-commits] [tor/master] Prop210: Only clients benefit from multiple consensus downloads

[nickm at torproject.org]

commit 9882a88b7457c48fb5ce48259a862593e7a2b309
Author: teor (Tim Wilson-Brown) <teor2345 at gmail.com>
Date:   Thu Dec 17 11:38:24 2015 +1100

    Prop210: Only clients benefit from multiple consensus downloads
    
    Anything that's a server can afford to wait for a few minutes.
    (Except for bridge relays, which act like clients.)
---
 src/or/networkstatus.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 173c109..584569a 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1286,14 +1286,14 @@ networkstatus_consensus_is_boostrapping(time_t now)
 }
 
 /** Check if we can use multiple directories for a consensus download.
- * Only clients (including bridges, but excluding bridge clients) benefit
+ * Only clients (including bridge relays, which act like clients) benefit
  * from multiple simultaneous consensus downloads. */
 int
 networkstatus_consensus_can_use_multiple_directories(
                                                   const or_options_t *options)
 {
   /* If we are a client, bridge, bridge client, or hidden service */
-  return (!directory_fetches_from_authorities(options));
+  return !public_server_mode(options);
 }
 
 /** Check if we can use fallback directory mirrors for a consensus download.