commit efae1bcef6ad8d45850686972dff0ba84060f86f Merge: 609cdec b5f6495 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 27 14:15:58 2015 -0400

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

changes/geoip6-april2015 | 2 + src/config/geoip6 | 1268 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 1013 insertions(+), 257 deletions(-)