From: Arlo Breault <arlolra@gmail.com>
Date: Tue, 23 Sep 2014 16:14:41 +0000 (-0400)
Subject: Remove a needless if (1)
X-Git-Tag: tor-0.2.6.3-alpha~119^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f591a4d94cfa6a8ad17fd126e9736196b10a266a;p=thirdparty%2Ftor.git

Remove a needless if (1)
---

diff --git a/src/or/directory.c b/src/or/directory.c
index f8c4fbda8c..616f593a17 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -527,14 +527,11 @@ MOCK_IMPL(void, directory_get_from_dirserver, (uint8_t dir_purpose,
     }
   } else { /* get_via_tor */
     /* Never use fascistfirewall; we're going via Tor. */
-    if (1) {
-      /* anybody with a non-zero dirport will do. Disregard firewalls. */
-      pds_flags |= PDS_IGNORE_FASCISTFIREWALL;
-      rs = router_pick_directory_server(type, pds_flags);
-      /* If we have any hope of building an indirect conn, we know some router
-       * descriptors.  If (rs==NULL), we can't build circuits anyway, so
-       * there's no point in falling back to the authorities in this case. */
-    }
+    pds_flags |= PDS_IGNORE_FASCISTFIREWALL;
+    rs = router_pick_directory_server(type, pds_flags);
+    /* If we have any hope of building an indirect conn, we know some router
+     * descriptors.  If (rs==NULL), we can't build circuits anyway, so
+     * there's no point in falling back to the authorities in this case. */
   }
 
   if (rs) {