mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse source
This commit is contained in:
Nick Mathewson 2013-03-10 23:00:13 -04:00
commit e4c5001bad
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/or/routerset.c
View file

@ -141,7 +141,7 @@ routerset_parse(routerset_t *target, const char *s, const char *description)
log_debug(LD_CONFIG, "Adding address %s to %s", nick, description);
smartlist_add(target->policies, p);
} else {
log_warn(LD_CONFIG, "Entry '%s' in %s is misformed.", nick,
log_warn(LD_CONFIG, "Entry '%s' in %s is malformed.", nick,
description);
r = -1;
tor_free(nick);

8
src/or/transports.c
View file

@ -339,12 +339,12 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port,
transport_free(t);
return -1;
case 1:
log_info(LD_GENERAL, "Succesfully registered transport %s at %s.",
log_info(LD_GENERAL, "Successfully registered transport %s at %s.",
t->name, fmt_addrport(&t->addr, t->port));
transport_free(t); /* falling */
return 0;
case 0:
log_info(LD_GENERAL, "Succesfully registered transport %s at %s.",
log_info(LD_GENERAL, "Successfully registered transport %s at %s.",
t->name, fmt_addrport(&t->addr, t->port));
return 0;
}
@ -676,10 +676,10 @@ register_client_proxy(const managed_proxy_t *mp)
transport_free(transport_tmp);
break;
case 0:
log_info(LD_GENERAL, "Succesfully registered transport %s", t->name);
log_info(LD_GENERAL, "Successfully registered transport %s", t->name);
break;
case 1:
log_info(LD_GENERAL, "Succesfully registered transport %s", t->name);
log_info(LD_GENERAL, "Successfully registered transport %s", t->name);
transport_free(transport_tmp);
break;
}