diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-20 13:53:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-20 13:53:11 -0400 |
| commit | 444193ff5df901073823e38fc291e913164e61e0 (patch) | |
| tree | 54c423d846cbc10bf105527656713f2a7f0e8540 /src/or/dirserv.c | |
| parent | ca7d5dc29920a8ae406e6a79cb3f987871790edf (diff) | |
| parent | 2849a95691c002108666eb414ff497bf93349e7d (diff) | |
| download | tor-444193ff5df901073823e38fc291e913164e61e0.tar tor-444193ff5df901073823e38fc291e913164e61e0.tar.gz | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/networkstatus.c
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 650d6a57c..31b198f2b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1238,7 +1238,7 @@ directory_caches_dir_info(or_options_t *options) return 0; /* We need an up-to-date view of network info if we're going to try to * block exit attempts from unknown relays. */ - return router_my_exit_policy_is_reject_star() && + return ! router_my_exit_policy_is_reject_star() && should_refuse_unknown_exits(options); } |