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

[nickm at torproject.org]

commit b4362b99cf1857f2fdf4390796bbf64ac9f204f3
Merge: 0f0dac0bf fde551a38
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 9 08:47:25 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-08-07 |     4 +
 src/config/geoip         | 14291 ++++++++++++++++++++++++++-------------------
 src/config/geoip6        |   974 ++-
 3 files changed, 9063 insertions(+), 6206 deletions(-)