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

[nickm@xxxxxxxxxxxxxx]

commit 2ce99b9f48477a9a93fd6987d8a4e19a20b9733a
Merge: 443dddb 34a51d1
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Apr 7 10:45:38 2016 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/geoip-april2016 |    4 +
 src/config/geoip        | 3255 +++++++++++++++++++++++++++++++++++------------
 src/config/geoip6       | 2549 +++++++++++++++++++++++++++++--------
 3 files changed, 4455 insertions(+), 1353 deletions(-)



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