[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[nickm at torproject.org]

commit fd6ba23f7bb4c47cedbfd65053b1148659b9d863
Merge: ef996c9 7ae34e7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:25:03 2016 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/geoip-jun2016 |    4 +
 src/config/geoip      | 3349 +++++++++++++++++++++++++++++++++++--------------
 src/config/geoip6     | 1366 ++++++++++++++++----
 src/or/config.c       |    2 -
 4 files changed, 3527 insertions(+), 1194 deletions(-)