commit e9a315c2df95373dd9d9460ddbe15489df1ab44a Merge: 4048c08 a5b50ef Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 6 08:33:08 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

changes/geoip-april2017 | 4 + src/config/geoip | 14366 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 677 ++- 3 files changed, 9792 insertions(+), 5255 deletions(-)