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

[nickm@xxxxxxxxxxxxxx]

commit e2979ebe252cb1a361b4c4aea1cbfce74697ec39
Merge: e17659b70 b9d9b16b7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 5 11:03:35 2017 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-october2017 |    4 +
 src/config/geoip          | 8683 +++++++++++++++++++++++++++------------------
 src/config/geoip6         |  653 ++--
 3 files changed, 5654 insertions(+), 3686 deletions(-)

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