diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-03-04 18:44:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-03-04 18:44:31 -0500 |
| commit | eb2e56ad3c469eeee38b63902361e86585da8c7c (patch) | |
| tree | 2d0c0437aea09b133528dc028e720b851726bb9d /src/or/config.c | |
| parent | b3ec39af8ff595b9490a330a356366b05c4750b9 (diff) | |
| parent | 3ff092391b065561da339dc05614beb4e586a4d8 (diff) | |
| download | tor-eb2e56ad3c469eeee38b63902361e86585da8c7c.tar tor-eb2e56ad3c469eeee38b63902361e86585da8c7c.tar.gz | |
Merge commit 'origin/maint-0.2.1'
Conflicts:
src/or/config.c
src/or/test.c
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 0e92fbf7b..6292f8f17 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) { |