commit bc4a44e4263d1c512694798cd2a3d587c58d0e3f Merge: 388ed4c81 9d24a352c Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:19:30 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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