[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

[nickm at torproject.org]

commit 3f40d9ec20c319cf57132ea526a2f9987a663599
Merge: 4f4d3de 493d9cd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 9 09:58:46 2017 -0400

    Merge branch 'maint-0.3.0'

 changes/geoip-june2017 |    4 +
 src/config/geoip       | 5079 +++++++++++++++++++++++++-----------------------
 src/config/geoip6      | 1952 +++++++++++++++++--
 3 files changed, 4449 insertions(+), 2586 deletions(-)