commit 3119cb5062e2cc7aee46c853a9c7373e6efdaaea Merge: 8408331b3 19429fac2 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 12:04:55 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

changes/geoip-2018-09-06 | 4 + src/config/geoip | 49324 +++++++++++++-------------------------------- src/config/geoip6 | 8574 ++++---- 3 files changed, 18629 insertions(+), 39273 deletions(-)