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

[nickm at torproject.org]

commit 1f5cdf2b6c72ae89eea630a2c4693273ff1aee6c
Merge: 6149703 d920cbb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 5 08:13:47 2016 -0500

    Merge branch 'maint-0.2.7'

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