diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/Makefile.am | 5 | ||||
| -rw-r--r-- | src/or/config.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/config/Makefile.am b/src/config/Makefile.am index 07e7cf26a9..21fba91774 100644 --- a/src/config/Makefile.am +++ b/src/config/Makefile.am @@ -1,11 +1,12 @@ confdir = $(sysconfdir)/tor -#EXTRA_DIST = fallback-consensus +EXTRA_DIST = fallback-consensus geoip conf_DATA = torrc.sample -#data_DATA = fallback-consensus +data_DATA = fallback-consensus geoip # If we don't have it, fake it. fallback-consensus: touch fallback-consensus + diff --git a/src/or/config.c b/src/or/config.c index 1d40fda1d5..74c500d345 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -198,7 +198,8 @@ static config_var_t _option_vars[] = { V(FetchServerDescriptors, BOOL, "1"), V(FetchHidServDescriptors, BOOL, "1"), V(FetchUselessDescriptors, BOOL, "0"), - V(GeoIPFile, STRING, NULL), + V(GeoIPFile, STRING, + SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"), V(Group, STRING, NULL), V(HardwareAccel, BOOL, "0"), V(HashedControlPassword, LINELIST, NULL), |