diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-05-28 04:47:12 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-05-28 04:47:12 +0000 |
| commit | 49595c40ff76e8cb9457db9a6c9b5049b39661f3 (patch) | |
| tree | b5cdab78d7516687e4c2307ff094b78cd94eb364 | |
| parent | 18e429c0773fe8772eae1555cf46fc2ef69736c9 (diff) | |
| download | tor-49595c40ff76e8cb9457db9a6c9b5049b39661f3.tar.gz tor-49595c40ff76e8cb9457db9a6c9b5049b39661f3.zip | |
Include an IP-to-country GeoIP file in the tarball, so relays
and bridge relays can report sanitized summaries of the usage
they're seeing.
svn:r14766
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | LICENSE | 5 | ||||
| -rw-r--r-- | src/config/Makefile.am | 5 | ||||
| -rw-r--r-- | src/or/config.c | 3 |
4 files changed, 15 insertions, 3 deletions
@@ -1,4 +1,9 @@ Changes in version 0.2.0.27-rc - 2008-05-?? + o Major features: + - Include an IP-to-country GeoIP file in the tarball, so relays + and bridge relays can report sanitized summaries of the usage + they're seeing. + o Minor features (controller): - Add a "PURPOSE=" argument to "STREAM NEW" events, as suggested by Robert Hogan. Fixes the first part of bug 681. @@ -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 6e55fa84aa..5ad4bf20bf 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), |