diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-03-29 10:53:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-03-29 10:53:09 -0400 |
| commit | f348daa6fb58295d876495ba875b826e87917ec9 (patch) | |
| tree | fb2b8a3e296112b10fdf3efaf1139d74aae93e47 /src/or/config.c | |
| parent | 4703bf8792b69745bc87d4b2838c3b69b98e81b8 (diff) | |
| parent | 734fad410368951e8f375a78bc8789d24cbe9c52 (diff) | |
| download | tor-f348daa6fb58295d876495ba875b826e87917ec9.tar.gz tor-f348daa6fb58295d876495ba875b826e87917ec9.zip | |
Merge remote-tracking branch 'linus/bug4875_2'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 30ffbd71df..2a8c540968 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2802,6 +2802,7 @@ static uint32_t last_resolved_addr = 0; * set *<b>hostname_out</b> to a new string holding the hostname we used to * get the address. Return 0 if all is well, or -1 if we can't find a suitable * public IP address. + * XXXX ipv6 */ int resolve_my_address(int warn_severity, const or_options_t *options, |