From: Arlo Breault <arlolra@gmail.com>
Date: Tue, 23 Sep 2014 16:15:10 +0000 (-0400)
Subject: Re-enable last resort attempt to get via tor.
X-Git-Tag: tor-0.2.6.3-alpha~119^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f752093e16a8a492f2b9b14255211f68548dc060;p=thirdparty%2Ftor.git

Re-enable last resort attempt to get via tor.

This looks like a bug introduced in
af658b7828e2ab814d70acbbb99f414dee239def.
---

diff --git a/src/or/directory.c b/src/or/directory.c
index 616f593a17..6fc5c206a1 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -518,14 +518,13 @@ MOCK_IMPL(void, directory_get_from_dirserver, (uint8_t dir_purpose,
         /* */
         rs = directory_pick_generic_dirserver(type, pds_flags,
                                               dir_purpose);
-        if (!rs) {
-          /*XXXX024 I'm pretty sure this can never do any good, since
-           * rs isn't set. */
+        if (!rs)
           get_via_tor = 1; /* last resort: try routing it via Tor */
-        }
       }
     }
-  } else { /* get_via_tor */
+  }
+
+  if (get_via_tor) {
     /* Never use fascistfirewall; we're going via Tor. */
     pds_flags |= PDS_IGNORE_FASCISTFIREWALL;
     rs = router_pick_directory_server(type, pds_flags);