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

[nickm@xxxxxxxxxxxxxx]

commit f25f7b759c0c3aa2ba333fcf2dd2ad89c5187eef
Merge: 3681463 c14c662
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jun 13 10:48:35 2016 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-jun2016 |    4 +
 src/config/geoip      | 3349 +++++++++++++++++++++++++++++++++++--------------
 src/config/geoip6     | 1366 ++++++++++++++++----
 3 files changed, 3527 insertions(+), 1192 deletions(-)

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