nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.2'

Browse Source 
Conflicts:

	src/or/config.c
This commit is contained in:
Roger Dingledine 2010-11-11 12:19:37 -05:00
commit a29596556c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug2050 Normal file
View File

@ -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.

2
src/or/config.c
View File

@ -2439,7 +2439,7 @@ resolve_my_address(int warn_severity, or_options_t *options,
} }
addr_string = tor_dup_ip(addr); 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 */ /* make sure we're ok with publishing an internal IP */
if (!options->DirServers && !options->AlternateDirAuthority) { if (!options->DirServers && !options->AlternateDirAuthority) {
/* if they are using the default dirservers, disallow internal IPs /* if they are using the default dirservers, disallow internal IPs