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

[nickm at torproject.org]

commit 4d70ed7be097593ab9ef80b52540e49d30baaf03
Merge: 7c25b41 210928f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 19 12:32:14 2016 +0200

    Merge branch 'maint-0.2.6' into maint-0.2.7

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