commit ce12cde92c023f8ce5d227a7526c01279cbce132
Merge: bd44053 9db47e7
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Dec 9 08:34:39 2016 -0500
Merge branch 'maint-0.2.4' into release-0.2.4
changes/geoip-december2016 | 4 +
src/config/geoip | 6259 ++++++++++++++++++++++++++------------------
src/config/geoip6 | 1193 ++++++++-
3 files changed, 4705 insertions(+), 2751 deletions(-)