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

[nickm@xxxxxxxxxxxxxx]

commit 418b6f8197929aaf7c532d68bd7e11aefcacaded
Merge: 1c1d71f fd082c3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 25 11:43:17 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

 changes/geoip-june2015  |    3 +
 changes/geoip6-june2015 |    3 +
 src/config/geoip        |14347 +++++++++++++++++++++++------------------------
 src/config/geoip6       | 2282 +++++---
 4 files changed, 8560 insertions(+), 8075 deletions(-)



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