commit 925ef048a977ccee0edb44ba68db2397b36d8c92 Merge: 24ddf5862 0e7558ab6 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:19:29 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)