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

[nickm@xxxxxxxxxxxxxx]

commit 75f7064a13c96eed928cd9bc1aa425a615ccbfcf
Merge: 844fc5eec 1af69c181
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jul 9 09:11:42 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/geoip-2018-07-03 |    4 +
 src/config/geoip         | 7171 ++++++++++++++++++++--------------------------
 src/config/geoip6        |  752 +++--
 3 files changed, 3732 insertions(+), 4195 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits