diff options
| author | Linus Nordberg <linus@torproject.org> | 2012-10-17 14:01:02 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@torproject.org> | 2012-10-17 14:01:02 +0200 |
| commit | e2313d8622aebc2704ce016dfef2be975fa535c3 (patch) | |
| tree | 59c4408fd8c7de9d5f042167b1da5ad0a8062bf2 /src/or/config.c | |
| parent | 74c6dafed63a3e51441dd484d652c0e337585949 (diff) | |
| download | tor-e2313d8622aebc2704ce016dfef2be975fa535c3.tar tor-e2313d8622aebc2704ce016dfef2be975fa535c3.tar.gz | |
White space.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index d5df5e73f..3b95909ed 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1532,7 +1532,8 @@ options_act(const or_options_t *old_options) } /* And maybe load geoip ipv6 file */ if (options->GeoIPv6File && - ((!old_options || !opt_streq(old_options->GeoIPv6File, options->GeoIPv6File)) + ((!old_options || !opt_streq(old_options->GeoIPv6File, + options->GeoIPv6File)) || !geoip_is_loaded())) { /* XXXX Don't use this "<default>" junk; make our filename options * understand prefixes somehow. See also comment for GeoIPFile. */ @@ -1549,7 +1550,6 @@ options_act(const or_options_t *old_options) geoip_load_file(AF_INET6, actual_fname, options); tor_free(actual_fname); } - if (options->CellStatistics || options->DirReqStatistics || options->EntryStatistics || options->ExitPortStatistics || |