Commit 7f61dafe authored by Roger Dingledine's avatar Roger Dingledine
Browse files

include the geoip file in the tarball, and load it by default

when tor starts.
this breaks rpms and maybe other packages.


svn:r14764
parent 60ca5445
......@@ -77,4 +77,9 @@ If you got Tor as a static binary with OpenSSL included, then you should know:
"This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
===============================================================================
"This program uses the IP-to-Country Database provided by
WebHosting.Info (http://www.webhosting.info), available from
http://ip-to-country.webhosting.info."
See the src/config/geoip file in particular.
===============================================================================
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
......@@ -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),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment