From: Roger Dingledine <arma@torproject.org>
Date: Sat, 3 Nov 2007 22:34:31 +0000 (+0000)
Subject: always use begin_dir for publishing and fetching bridge
X-Git-Tag: tor-0.2.0.10-alpha~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb7b680a045fa25b2fe12df9bbc6addfa4b212d7;p=thirdparty%2Ftor.git

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 29e852f512..c9b0de0ea9 100644
--- 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));