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

[nickm@xxxxxxxxxxxxxx]

commit a24f29ec5d761ecb13f59f84b5b0b42819c1de56
Merge: 3433216 b840b76
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 8 10:36:51 2013 -0500

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

 changes/geoip-feb2013 |    3 +
 src/config/geoip      | 3509 +++++++++++++++++++++++++++++++++----------------
 2 files changed, 2353 insertions(+), 1159 deletions(-)

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