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

touchups

Browse Source 
svn:r8558
This commit is contained in:
Roger Dingledine 2006-10-01 04:55:12 +00:00
parent 6103077235
commit 96a4cb1dfa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/config.c
View File

@ -2132,7 +2132,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
if (options->Nickname == NULL) {
if (server_mode(options)) {
if (!(options->Nickname = get_default_nickname())) {
log_notice(LD_CONFIG, "Couldn't pick a nickname hostname based on "
log_notice(LD_CONFIG, "Couldn't pick a nickname based on "
"our hostname; using %s instead.", UNNAMED_ROUTER_NICKNAME);
options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME);
} else {

6
src/or/policies.c
View File

@ -520,7 +520,7 @@ exit_policy_remove_redundancies(addr_policy_t **dest)
tmp=ap;
while (tmp) {
if (tmp->next && addr_policy_covers(ap, tmp->next)) {
log(LOG_INFO, LD_CONFIG, "Removing exit policy %s. It is made "
log(LOG_DEBUG, LD_CONFIG, "Removing exit policy %s. It is made "
"redundant by %s.", tmp->next->string, ap->string);
victim = tmp->next;
tmp->next = victim->next;
@ -550,8 +550,8 @@ exit_policy_remove_redundancies(addr_policy_t **dest)
}
if (ap->policy_type == tmp->policy_type &&
addr_policy_covers(tmp, ap)) {
log(LOG_INFO, LD_CONFIG, "Removing exit policy %s. It is made "
"redundant by %s.", ap->string, tmp->string);
log(LOG_DEBUG, LD_CONFIG, "Removing exit policy %s. It is already "
"covered by %s.", ap->string, tmp->string);
victim = ap;
ap = ap->next;