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

[nickm at torproject.org]

commit 7df92c0e0cafd60088a5a3dc8d2e361e318f8e32
Merge: c6b8f7843 8afc100cb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 11 12:04:56 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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