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

[nickm at torproject.org]

commit a23c36ebcd6af162fb08999f458faf98571eecbf
Merge: da86a70bd e5fe8b0e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 10 11:34:49 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/geoip-2018-10-09 |     4 +
 src/config/geoip         | 38518 ++++++++++++++++++++++++++++++++++-----------
 src/config/geoip6        |  1317 +-
 3 files changed, 30779 insertions(+), 9060 deletions(-)