diff options
author | Roger Dingledine <arma@torproject.org> | 2008-06-04 09:02:25 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2008-06-04 09:02:25 +0000 |
commit | b8bde32c3a906ec58a3b37f6e49275a1a8a2d40a (patch) | |
tree | bf5e406434cfb84c734b3b6b022304fd5783f809 /src/or/config.c | |
parent | c6b3cf4b968f65312a1e52aed53b7256a097ca2b (diff) | |
download | tor-b8bde32c3a906ec58a3b37f6e49275a1a8a2d40a.tar.gz tor-b8bde32c3a906ec58a3b37f6e49275a1a8a2d40a.zip |
forward-port r14934
svn:r14936
Diffstat (limited to 'src/or/config.c')
-rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 372af214e2..43d1ee8e37 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1282,7 +1282,7 @@ options_act(or_options_t *old_options) tor_snprintf(actual_fname, len, "%s\\geoip", conf_root); } #endif - geoip_load_file(actual_fname); + geoip_load_file(actual_fname, options); tor_free(actual_fname); } /* Check if we need to parse and add the EntryNodes config option. */ |