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

[nickm@xxxxxxxxxxxxxx]

commit b2c220a623408839b0d918f343a08e92367b45d5
Merge: 7d1d868ea f1278b7e5
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 8 10:29:05 2018 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2018-02-07 |     4 +
 src/config/geoip         | 34364 ++++++++++++++++++++++++++++++++++++---------
 src/config/geoip6        |   841 +-
 3 files changed, 28369 insertions(+), 6840 deletions(-)

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