Stop using encrypted dir connections for direct dir requests when you're

acting like a dir mirror. This should reduce load on the directory
authorities, and also will remove the ugly "We just marked ourself as
down" warnings my authorities keep getting.


svn:r14114
This commit is contained in:
Roger Dingledine 2008-03-18 22:54:37 +00:00
parent 6c37f1e309
commit fc3f30c95e
2 changed files with 8 additions and 7 deletions

View File

@ -1,9 +1,9 @@
Changes in version 0.2.0.22-rc - 2008-03-18 Changes in version 0.2.0.22-rc - 2008-03-18
o Major features: o Major features:
- Enable encrypted directory connections by default, so censor - Enable encrypted directory connections by default for non-relays,
tools that block Tor directory connections based on their plaintext so censor tools that block Tor directory connections based on their
patterns will no longer work. This means Tor works in certain plaintext patterns will no longer work. This means Tor works in
censored countries by default again. certain censored countries by default again.
o Major bugfixes: o Major bugfixes:
- Make sure servers always request certificates from clients during - Make sure servers always request certificates from clients during

View File

@ -625,9 +625,10 @@ directory_command_should_use_begindir(or_options_t *options, uint32_t addr,
{ {
if (!or_port) if (!or_port)
return 0; /* We don't know an ORPort -- no chance. */ return 0; /* We don't know an ORPort -- no chance. */
if (!anonymized_connection && if (!anonymized_connection)
!fascist_firewall_allows_address_or(addr, or_port)) if (!fascist_firewall_allows_address_or(addr, or_port) ||
return 0; /* We're firewalled -- also no chance. */ directory_fetches_from_authorities(options))
return 0; /* We're firewalled or are acting like a relay -- also no. */
if (!options->TunnelDirConns && if (!options->TunnelDirConns &&
router_purpose != ROUTER_PURPOSE_BRIDGE) router_purpose != ROUTER_PURPOSE_BRIDGE)
return 0; /* We prefer to avoid using begindir conns. Fine. */ return 0; /* We prefer to avoid using begindir conns. Fine. */