commit 0ec6757091434612c4f956b9ccdee6089f408564 Merge: ee5337e 9c66afe Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 7 10:11:54 2015 -0500 Merge branch 'maint-0.2.7' changes/geoip-december2015 | 4 + src/config/geoip | 4547 ++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 2580 +++++++++++++++++++++---- 3 files changed, 5512 insertions(+), 1619 deletions(-)