[or-cvs] r14766: Include an IP-to-country GeoIP file in the tarball, so relay (in tor/branches/tor-0_2_0-patches: . src/config src/or)

[arma at seul.org]

Author: arma
Date: 2008-05-28 00:47:12 -0400 (Wed, 28 May 2008)
New Revision: 14766

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/LICENSE
   tor/branches/tor-0_2_0-patches/src/config/Makefile.am
   tor/branches/tor-0_2_0-patches/src/or/config.c
Log:
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.


Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-05-28 04:40:02 UTC (rev 14765)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-05-28 04:47:12 UTC (rev 14766)
@@ -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.

Modified: tor/branches/tor-0_2_0-patches/LICENSE
===================================================================
--- tor/branches/tor-0_2_0-patches/LICENSE	2008-05-28 04:40:02 UTC (rev 14765)
+++ tor/branches/tor-0_2_0-patches/LICENSE	2008-05-28 04:47:12 UTC (rev 14766)
@@ -77,4 +77,9 @@
  "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.
+===============================================================================
 

Modified: tor/branches/tor-0_2_0-patches/src/config/Makefile.am
===================================================================
--- tor/branches/tor-0_2_0-patches/src/config/Makefile.am	2008-05-28 04:40:02 UTC (rev 14765)
+++ tor/branches/tor-0_2_0-patches/src/config/Makefile.am	2008-05-28 04:47:12 UTC (rev 14766)
@@ -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
+

Modified: tor/branches/tor-0_2_0-patches/src/or/config.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/config.c	2008-05-28 04:40:02 UTC (rev 14765)
+++ tor/branches/tor-0_2_0-patches/src/or/config.c	2008-05-28 04:47:12 UTC (rev 14766)
@@ -198,7 +198,8 @@
   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),