[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

[nickm at torproject.org]

commit 9c66afe7720aa32a2640564bbf8b0af64e394ba5
Merge: e408aa3 089ee13
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 7 10:11:21 2015 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-december2015 |    4 +
 src/config/geoip           | 4547 ++++++++++++++++++++++++++++++++------------
 src/config/geoip6          | 2580 +++++++++++++++++++++----
 3 files changed, 5512 insertions(+), 1619 deletions(-)