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

[nickm at torproject.org]

commit 493d9cd17b28ff97264502e19b5b2cbb61216721
Merge: ddfb877 cd7d006
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 9 09:58:46 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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