diff options
| author | Arlo Breault <arlolra@gmail.com> | 2014-09-23 12:15:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-23 12:15:10 -0400 |
| commit | f752093e16a8a492f2b9b14255211f68548dc060 (patch) | |
| tree | 5f09ccbd68ddaf036b4c354ca6c30f76e12f88ef /src/or/directory.c | |
| parent | f591a4d94cfa6a8ad17fd126e9736196b10a266a (diff) | |
| download | tor-f752093e16a8a492f2b9b14255211f68548dc060.tar.gz tor-f752093e16a8a492f2b9b14255211f68548dc060.zip | |
Re-enable last resort attempt to get via tor.
This looks like a bug introduced in
af658b7828e2ab814d70acbbb99f414dee239def.
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 616f593a17..6fc5c206a1 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -518,14 +518,13 @@ MOCK_IMPL(void, directory_get_from_dirserver, (uint8_t dir_purpose, /* */ rs = directory_pick_generic_dirserver(type, pds_flags, dir_purpose); - if (!rs) { - /*XXXX024 I'm pretty sure this can never do any good, since - * rs isn't set. */ + if (!rs) get_via_tor = 1; /* last resort: try routing it via Tor */ - } } } - } else { /* get_via_tor */ + } + + if (get_via_tor) { /* Never use fascistfirewall; we're going via Tor. */ pds_flags |= PDS_IGNORE_FASCISTFIREWALL; rs = router_pick_directory_server(type, pds_flags); |