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

[nickm@xxxxxxxxxxxxxx]

commit f06d9a9cef036fc4da995f3ffda8e7a7770d0b74
Merge: 9ca3295 d5ac79e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 5 08:13:13 2016 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-february2016 |    4 +
 src/config/geoip           | 2144 +++++++++++++++++++++++++++++++++-----------
 src/config/geoip6          |  864 ++++++++++++++----
 3 files changed, 2328 insertions(+), 684 deletions(-)



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