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

[nickm at torproject.org]

commit 918bda25adb0e81608bb9c0caeed7eaf4345d263
Merge: db2e916af 9b4ecbaa7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 6 14:29:48 2019 -0500

    Merge branch 'maint-0.4.0'

 changes/geoip-2019-03-04 |     4 +
 src/config/geoip         | 12163 ++++++++++++++++++++++++---------------------
 src/config/geoip6        |  2251 ++++++---
 3 files changed, 8221 insertions(+), 6197 deletions(-)