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

[nickm at torproject.org]

commit 4d5b252f0f0179add75e4c2a2f8ab690864584f3
Merge: fbae15a 4d70ed7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 19 12:34:27 2016 +0200

    Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-july2016 |    4 +
 src/config/geoip       | 4615 +++++++++++++++++++++++++++++++++---------------
 src/config/geoip6      |  982 ++++++++---
 3 files changed, 3879 insertions(+), 1722 deletions(-)