[tor-commits] [tor/master] Re-enable last resort attempt to get via tor.

[nickm at torproject.org]

commit f752093e16a8a492f2b9b14255211f68548dc060
Author: Arlo Breault <arlolra at gmail.com>
Date:   Tue Sep 23 12:15:10 2014 -0400

    Re-enable last resort attempt to get via tor.
    
    This looks like a bug introduced in
    af658b7828e2ab814d70acbbb99f414dee239def.
---
 src/or/directory.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 616f593..6fc5c20 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);