diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/or/config.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -115,6 +115,10 @@ Changes in version 0.2.1.25 - 2010-??-?? - When freeing a cipher, zero it out completely. We only zeroed the first ptrsize bytes. Bugfix on tor-0.0.2pre8. Discovered and patched by ekir. Fixes bug 1254. + - Avoid a bug that set IPs incorrectly on relays that did't set + Address to an IP address, when that address fails to resolve. + Fixes bug 1269. + o Minor bugfixes: - Fix a dereference-then-NULL-check sequence when publishing descriptors. Bugfix on tor-0.2.1.5-alpha. Discovered by ekir, diff --git a/src/or/config.c b/src/or/config.c index 0e92fbf7be..6292f8f17d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2221,7 +2221,7 @@ resolve_my_address(int warn_severity, or_options_t *options, if (tor_inet_aton(hostname, &in) == 0) { /* then we have to resolve it */ explicit_ip = 0; - if (!tor_lookup_hostname(hostname, &addr)) { + if (tor_lookup_hostname(hostname, &addr)) { uint32_t interface_ip; if (explicit_hostname) { |