From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Sep 2014 16:57:10 +0000 (-0400)
Subject: fixup! Send more descriptor requests per attempt when using tunneled connections
X-Git-Tag: tor-0.2.6.3-alpha~119^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=055ad9c5fb0de4295ccb05357d6a2d8ad29d03e4;p=thirdparty%2Ftor.git

fixup! Send more descriptor requests per attempt when using tunneled connections

Limit the number of simultaneous connections to a single router for
server descriptors too.
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index efa4abbac1..ec9e801ef2 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4438,7 +4438,7 @@ launch_descriptor_downloads(int purpose,
     }
   }
 
-  if (!authdir_mode_any_nonhidserv(options) || fetch_microdesc) {
+  if (!authdir_mode_any_nonhidserv(options)) {
     /* If we wind up going to the authorities, we want to only open one
      * connection to each authority at a time, so that we don't overload
      * them.  We do this by setting PDS_NO_EXISTING_SERVERDESC_FETCH