[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

[nickm at torproject.org]

commit 37b0d27a343c8ae1e6a552ed8d7ab7b26dae6084
Merge: 7660471 d9b11d0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 7 09:14:31 2016 -0800

    Merge branch 'maint-0.2.7'

 changes/geoip-january2016 |    4 +
 src/config/geoip          | 1734 +++++++++++++++++++++++++++++++++++----------
 src/config/geoip6         |  881 +++++++++++++++++------
 3 files changed, 2016 insertions(+), 603 deletions(-)