commit ef8710658322724a2bf2da698593c9cb966a8d2e Merge: 2728a12 2ee3dbe Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 13 10:49:15 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-jun2016 | 4 + src/config/geoip | 3349 +++++++++++++++++++++++++++++++++++-------------- src/config/geoip6 | 1366 ++++++++++++++++---- 3 files changed, 3527 insertions(+), 1192 deletions(-)