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

[nickm at torproject.org]

commit 5322713b481411c85a1561af40121bc034b6eda8
Merge: 1ffe29f 3d2d3f2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 9 08:34:45 2016 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-december2016 |    4 +
 src/config/geoip           | 6259 ++++++++++++++++++++++++++------------------
 src/config/geoip6          | 1193 ++++++++-
 3 files changed, 4705 insertions(+), 2751 deletions(-)