[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm@xxxxxxxxxxxxxx]

commit 74ac463e7fb806e5abf48be788daf03c40e930ad
Merge: dd63033fc 19f386852
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 12 08:11:20 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-06-07 |    4 +
 src/config/geoip         | 5848 +++++++++++++++++++++++++++++-----------------
 src/config/geoip6        |  810 ++++++-
 3 files changed, 4354 insertions(+), 2308 deletions(-)



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