commit 75501dbe4a70914ec8f19689849d3539d87be271 Merge: 015f710 6345dfa Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 21 14:29:43 2014 -0400

Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4

changes/geoip6-july2014 | 2 + src/config/geoip6 | 3674 ++++++++++++----------------------------------- 2 files changed, 940 insertions(+), 2736 deletions(-)