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

[nickm at torproject.org]

commit fe689de084116bd54eb3f90baba4620eef5d1001
Merge: 78735f8 d347531
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 11:22:02 2013 -0400

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

 changes/geoip-june2013 |    3 +
 src/config/geoip       |106050 +++++-------------------------------------------
 2 files changed, 9168 insertions(+), 96885 deletions(-)