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

[nickm at torproject.org]

commit d920cbb82c2203b328d66d6c9d8f28fd35608560
Merge: 7d1fe7c 44ad3be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 5 08:13:35 2016 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-february2016 |    4 +
 src/config/geoip           | 2144 +++++++++++++++++++++++++++++++++-----------
 src/config/geoip6          |  864 ++++++++++++++----
 3 files changed, 2328 insertions(+), 684 deletions(-)