always use begin_dir for publishing and fetching bridge

descriptors, no matter our config

svn:r12365

diff --git a/src/or/directory.c b/src/or/directory.c
index 29e852f5126f9295b2fed34673cc490616889a7a..c9b0de0ea985ae11cc444a6a143ca4725eaeb621 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -624,7 +624,9 @@ directory_initiate_command(const char *address, uint32_t addr,
 {
   dir_connection_t *conn;
   or_options_t *options = get_options();
-  int use_begindir = options->TunnelDirConns && supports_begindir && or_port &&
+  int use_begindir = supports_begindir && or_port &&
+                     (options->TunnelDirConns ||
+                      router_purpose == ROUTER_PURPOSE_BRIDGE) &&
                      (anonymized_connection ||
                       fascist_firewall_allows_address_or(addr, or_port));