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

[nickm at torproject.org]

commit f741505642773ac8733dffe06365c532f5a92ee0
Merge: e5601f14e 8a873a569
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 11 12:04:56 2018 -0400

    Merge branch 'maint-0.3.4'

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