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

commit 8982719f6ac06383c26283b60acf6b3d3fde613e Merge: 8e68fe7e1 fe19b40fe Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 9 08:47:24 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/geoip-2018-08-07 | 4 + src/config/geoip | 14291 ++++++++++++++++++++++++++------------------- src/config/geoip6 | 974 ++- 3 files changed, 9063 insertions(+), 6206 deletions(-)