[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm at torproject.org]

commit a6cf5f60141f0bf2577ac552f8a8fde9152a6d7c
Merge: 75e2256 f587691
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 08:08:36 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/geoip-may2017 |    4 +
 src/config/geoip      | 5862 +++++++++++++++++++++++++++++++------------------
 src/config/geoip6     |  689 +++++-
 3 files changed, 4358 insertions(+), 2197 deletions(-)