[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

[nickm@xxxxxxxxxxxxxx]

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Sep 7 15:18:00 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 |     4 +
 src/config/geoip            | 10802 ++++++++++++++++++++++++------------------
 src/config/geoip6           |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

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