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

[nickm at torproject.org]

commit 1fe6e318f1d7972a84942b916e490cc47186afbe
Merge: 1ff7c6075 08ed0d793
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 12:15:24 2017 -0500

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/geoip-2017-12-06 |     4 +
 src/config/geoip         | 12380 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  3373 +++++++++---
 3 files changed, 10033 insertions(+), 5724 deletions(-)