nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2010-12-06 11:37:37 -05:00
commit bbadf07d16
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug2097-more Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes:
- Fix a logic error in directory_fetches_from_authorities that
would cause all _non_-exits refusing single-hop-like circuits to
fetch from authorities, when we wanted to have _exits_ fetch
from authorities. Fix by boboper; fixes more of 2097; bugfix on
0.2.2.16-alpha.

2
src/or/dirserv.c
View File

@ -1186,7 +1186,7 @@ directory_fetches_from_authorities(or_options_t *options)
return 0; return 0;
if (server_mode(options) && router_pick_published_address(options, &addr)<0) if (server_mode(options) && router_pick_published_address(options, &addr)<0)
return 1; /* we don't know our IP address; ask an authority. */ return 1; /* we don't know our IP address; ask an authority. */
refuseunknown = router_my_exit_policy_is_reject_star() && refuseunknown = ! router_my_exit_policy_is_reject_star() &&
should_refuse_unknown_exits(options); should_refuse_unknown_exits(options);
if (options->DirPort == 0 && !refuseunknown) if (options->DirPort == 0 && !refuseunknown)
return 0; return 0;