commit a31078a581c35310cd642b16ce57efd5b888f6dc Merge: 558f7d3 4d5b252 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 19 12:34:37 2016 +0200

Merge branch 'maint-0.2.8'

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