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

[nickm at torproject.org]

commit c90c370ab361ff0103becbd6fab9e1a9b5a460fe
Merge: 17090fa 0c2fb64
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 20 12:37:58 2013 -0400

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

 changes/geoip-may2013 |    3 +
 src/config/geoip      |20373 +++++++++++++++++++++++++------------------------
 2 files changed, 10221 insertions(+), 10155 deletions(-)