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

[nickm at torproject.org]

commit 51ae5d84402348702f9244245c098923e8580d3b
Merge: 7ec1718 ded2c8c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 10:12:35 2017 -0500

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/geoip-march2017 |     4 +
 src/config/geoip        | 13115 +++++++++++++++++++---------------------------
 src/config/geoip6       |   754 ++-
 3 files changed, 5884 insertions(+), 7989 deletions(-)