[tor-commits] [tor/master] Actually distribute the geoip6 file.

[nickm at torproject.org]

commit b17aa28e46d193bb0beb3a9c6fabd1df9daff6f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 13 21:24:28 2012 -0500

    Actually distribute the geoip6 file.
    
    Fixes a bug (with no ticket) on 0.2.4.6-alpha.
---
 changes/dist-geoip6   |    3 +++
 src/config/include.am |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/dist-geoip6 b/changes/dist-geoip6
new file mode 100644
index 0000000..2f2bf8f
--- /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 e6e1fe0..35961b8 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.