aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorArlo Breault <arlolra@gmail.com>2014-09-23 12:14:41 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-23 12:14:41 -0400
commitf591a4d94cfa6a8ad17fd126e9736196b10a266a (patch)
tree99a060418abbe76ed57ed645e34a896f3f94d0f7 /src/or/directory.c
parentc00b397992edefb4507f2c1408e289243f5c7916 (diff)
downloadtor-f591a4d94cfa6a8ad17fd126e9736196b10a266a.tar.gz
tor-f591a4d94cfa6a8ad17fd126e9736196b10a266a.zip
Remove a needless if (1)
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c13
1 files changed, 5 insertions, 8 deletions
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) {