diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-11-11 12:19:37 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-11-11 12:19:37 -0500 |
| commit | a29596556c60fbbf687b1af48b9e6646b25f208e (patch) | |
| tree | d52503460343d53381865751c0a83e732aca1d50 | |
| parent | d4e660ff68242f708bec4b527f17a06fb6183ac7 (diff) | |
| parent | 362bb5c625b831095e1d9dae1c348131257afab4 (diff) | |
| download | tor-a29596556c60fbbf687b1af48b9e6646b25f208e.tar.gz tor-a29596556c60fbbf687b1af48b9e6646b25f208e.zip | |
Merge branch 'maint-0.2.2'
Conflicts:
src/or/config.c
| -rw-r--r-- | changes/bug2050 | 5 | ||||
| -rw-r--r-- | src/or/config.c | 2 |
2 files changed, 6 insertions, 1 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 8d7da19861..279b6599d5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2439,7 +2439,7 @@ resolve_my_address(int warn_severity, or_options_t *options, } addr_string = tor_dup_ip(addr); - if (is_internal_IP(addr, 0) && options->_PublishServerDescriptor) { + if (is_internal_IP(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 |