From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 14 Nov 2012 02:24:28 +0000 (-0500)
Subject: Actually distribute the geoip6 file.
X-Git-Tag: tor-0.2.4.7-alpha~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b17aa28e46d193bb0beb3a9c6fabd1df9daff6f0;p=thirdparty%2Ftor.git

Actually distribute the geoip6 file.

Fixes a bug (with no ticket) on 0.2.4.6-alpha.
---

diff --git a/changes/dist-geoip6 b/changes/dist-geoip6
new file mode 100644
index 0000000000..2f2bf8f99f
--- /dev/null
+++ b/changes/dist-geoip6
@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Distribute and install the geoip6 IPv6 GeoIP database. Bugfix
+      on 0.2.4.6-alpha. 
diff --git a/src/config/include.am b/src/config/include.am
index e6e1fe0440..35961b829a 100644
--- a/src/config/include.am
+++ b/src/config/include.am
@@ -2,12 +2,12 @@ confdir = $(sysconfdir)/tor
 
 tordatadir = $(datadir)/tor
 
-EXTRA_DIST+= src/config/geoip
+EXTRA_DIST+= src/config/geoip src/config/geoip6
 # fallback-consensus
 
 conf_DATA = src/config/torrc.sample
 
-tordata_DATA = src/config/geoip
+tordata_DATA = src/config/geoip src/config/geoip6
 # fallback_consensus
 
 # If we don't have it, fake it.