commit 4c2ad485686e804f0d3c583597551726ac357b23 Merge: 0e5e5ba a5b50ef Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 6 08:32:12 2017 -0400

Merge branch 'maint-0.3.0'

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