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

[nickm at torproject.org]

commit 8c2cad52c45a036c6a73da3fd208f5b7bdf649fa
Merge: 77abd68 9d3de77
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:25:11 2016 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

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