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

[nickm@xxxxxxxxxxxxxx]

commit 877dd1d6c8038cdef48a12a128eb08ae02ac628b
Merge: f7151387d 428f8a375
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Dec 20 12:15:23 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-2017-12-06 |     4 +
 src/config/geoip         | 12380 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  3373 +++++++++---
 3 files changed, 10033 insertions(+), 5724 deletions(-)



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