diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-11-03 22:34:31 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-11-03 22:34:31 +0000 |
| commit | fb7b680a045fa25b2fe12df9bbc6addfa4b212d7 (patch) | |
| tree | b98115b661a6a93fb6650fdce0b90ab585220d37 | |
| parent | fcc115e7635140df93253032a613c2ee6ff1179e (diff) | |
| download | tor-fb7b680a045fa25b2fe12df9bbc6addfa4b212d7.tar.gz tor-fb7b680a045fa25b2fe12df9bbc6addfa4b212d7.zip | |
always use begin_dir for publishing and fetching bridge
descriptors, no matter our config
svn:r12365
| -rw-r--r-- | src/or/directory.c | 4 |
1 files changed, 3 insertions, 1 deletions
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)); |