diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-05-28 04:37:34 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-05-28 04:37:34 +0000 |
| commit | 7f61dafe8dcee4501189aa09130fb9c772e534dd (patch) | |
| tree | 8a260cfb057b31bf08f6816ec8acd8b054168070 | |
| parent | 60ca544578273f41f399e68b132605fd26bd32b6 (diff) | |
| download | tor-7f61dafe8dcee4501189aa09130fb9c772e534dd.tar.gz tor-7f61dafe8dcee4501189aa09130fb9c772e534dd.zip | |
include the geoip file in the tarball, and load it by default
when tor starts.
this breaks rpms and maybe other packages.
svn:r14764
| -rw-r--r-- | LICENSE | 5 | ||||
| -rw-r--r-- | src/config/Makefile.am | 5 | ||||
| -rw-r--r-- | src/or/config.c | 3 |
3 files changed, 10 insertions, 3 deletions
@@ -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. +=============================================================================== 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), |