diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-11-11 12:12:17 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-11-11 12:12:17 -0500 |
| commit | 362bb5c625b831095e1d9dae1c348131257afab4 (patch) | |
| tree | f4c287acb29dfc0b5597139321bb03fda091427b | |
| parent | a4bf5b51e9c84a74720ea95eed19d21faf8333ae (diff) | |
| parent | 0a38358210df95f29fb7cfbb6ce67509b988ab4a (diff) | |
| download | tor-362bb5c625b831095e1d9dae1c348131257afab4.tar.gz tor-362bb5c625b831095e1d9dae1c348131257afab4.zip | |
Merge branch 'maint-0.2.1' into maint-0.2.2
| -rw-r--r-- | changes/bug2050 | 5 | ||||
| -rw-r--r-- | src/or/config.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug2050 b/changes/bug2050 new file mode 100644 index 0000000000..3e45d3463f --- /dev/null +++ b/changes/bug2050 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Learn our external IP address when we're a relay or bridge, even if + we set PublishServerDescriptor to 0. Bugfix on 0.2.0.3-alpha, + where we introduced bridge relays that don't need to publish to + be useful. Fixes bug 2050. diff --git a/src/or/config.c b/src/or/config.c index ee0c466e0b..06a9a3b163 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2406,8 +2406,7 @@ resolve_my_address(int warn_severity, or_options_t *options, } tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf)); - if (is_internal_IP(ntohl(in.s_addr), 0) && - options->_PublishServerDescriptor) { + if (is_internal_IP(ntohl(in.s_addr), 0)) { /* make sure we're ok with publishing an internal IP */ if (!options->DirServers && !options->AlternateDirAuthority) { /* if they are using the default dirservers, disallow internal IPs |