commit 210928f66a5acda19d3a0a00d44f1f9523fecfe3 Merge: 92891de d95c280 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 19 12:31:54 2016 +0200

Merge branch 'maint-0.2.5' into maint-0.2.6

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