From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 Feb 2013 22:20:46 +0000 (-0500)
Subject: Fix bootstrapping with bridges by making is_dir_cache is set on them.
X-Git-Tag: tor-0.2.4.11-alpha~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad49abe5a147187582c8070b0b33d476f37fc792;p=thirdparty%2Ftor.git

Fix bootstrapping with bridges by making is_dir_cache is set on them.

This fixes bug 8367, introduced in d7089ff228227259137b5a8b. Not in
any released Tor.
---

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 51c3a56742..e89eabce35 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -133,6 +133,8 @@ entry_guard_set_status(entry_guard_t *e, const node_t *node,
   if (node) {
     int is_dir = node_is_dir(node) && node->rs &&
       node->rs->version_supports_microdesc_cache;
+    if (options->UseBridges && node_is_a_configured_bridge(node))
+      is_dir = 1;
     if (e->is_dir_cache != is_dir) {
       e->is_dir_cache = is_dir;
       changed = 1;
@@ -354,6 +356,8 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend,
       }
       entry->is_dir_cache = node->rs &&
         node->rs->version_supports_microdesc_cache;
+      if (get_options()->UseBridges && node_is_a_configured_bridge(node))
+        entry->is_dir_cache = 1;
       return NULL;
     }
   } else if (!for_directory) {