[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[nickm@xxxxxxxxxxxxxx]

commit cb8c5c023f0e349f30fd6a539437d76358b8b87a
Merge: efae1bc e5907e9
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 25 11:42:31 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

 changes/geoip-june2015 |    3 +
 src/config/geoip       |14347 +++++++++++++++++++++++-------------------------
 2 files changed, 6999 insertions(+), 7351 deletions(-)



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