nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.2'

Browse Source
This commit is contained in:
Roger Dingledine 2011-05-21 18:14:16 -04:00
commit cb7fff193e
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug1810 Normal file
View File

@ -0,0 +1,6 @@
o Major bugfixes:
- Don't decide to make a new descriptor when receiving a HUP signal.
This bug has caused a lot of relays to disappear from the consensus
periodically. Fixes the most common case of triggering bug 1810;
bugfix on 0.2.2.7-alpha.

2
src/common/util.c
View File

@ -2093,7 +2093,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out)
int save_errno = errno; int save_errno = errno;
if (errno == ENOENT && (flags & RFTS_IGNORE_MISSING)) if (errno == ENOENT && (flags & RFTS_IGNORE_MISSING))
severity = LOG_INFO; severity = LOG_INFO;
log_fn(severity, LD_FS,"Could not open \"%s\": %s ",filename, log_fn(severity, LD_FS,"Could not open \"%s\": %s",filename,
strerror(errno)); strerror(errno));
errno = save_errno; errno = save_errno;
return NULL; return NULL;

2
src/or/circuitbuild.c
View File

@ -1750,7 +1750,7 @@ circuit_handle_first_hop(origin_circuit_t *circ)
/* not currently connected in a useful way. */ /* not currently connected in a useful way. */
const char *name = strlen(firsthop->extend_info->nickname) ? const char *name = strlen(firsthop->extend_info->nickname) ?
firsthop->extend_info->nickname : fmt_addr(&firsthop->extend_info->addr); firsthop->extend_info->nickname : fmt_addr(&firsthop->extend_info->addr);
log_info(LD_CIRC, "Next router is %s: %s ", log_info(LD_CIRC, "Next router is %s: %s",
safe_str_client(name), msg?msg:"???"); safe_str_client(name), msg?msg:"???");
circ->_base.n_hop = extend_info_dup(firsthop->extend_info); circ->_base.n_hop = extend_info_dup(firsthop->extend_info);

2
src/or/config.c
View File

@ -3896,7 +3896,7 @@ options_transition_affects_workers(or_options_t *old_options,
old_options->ORPort != new_options->ORPort || old_options->ORPort != new_options->ORPort ||
old_options->ServerDNSSearchDomains != old_options->ServerDNSSearchDomains !=
new_options->ServerDNSSearchDomains || new_options->ServerDNSSearchDomains ||
old_options->SafeLogging != new_options->SafeLogging || old_options->_SafeLogging != new_options->_SafeLogging ||
old_options->ClientOnly != new_options->ClientOnly || old_options->ClientOnly != new_options->ClientOnly ||
public_server_mode(old_options) != public_server_mode(new_options) || public_server_mode(old_options) != public_server_mode(new_options) ||
!config_lines_eq(old_options->Logs, new_options->Logs) || !config_lines_eq(old_options->Logs, new_options->Logs) ||

1
src/or/router.c
View File

@ -87,7 +87,6 @@ set_onion_key(crypto_pk_env_t *k)
tor_mutex_acquire(key_lock); tor_mutex_acquire(key_lock);
crypto_free_pk_env(onionkey); crypto_free_pk_env(onionkey);
onionkey = k; onionkey = k;
onionkey_set_at = time(NULL);
tor_mutex_release(key_lock); tor_mutex_release(key_lock);
mark_my_descriptor_dirty("set onion key"); mark_my_descriptor_dirty("set onion key");
} }