[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/geoip-manual-update-apr2013'

[nickm at torproject.org]

commit 5d4f43eb4ac1ed28d32ee2744662e6038d072495
Merge: 1bbfadf c892555
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 8 11:10:37 2013 -0400

    Merge remote-tracking branch 'karsten/geoip-manual-update-apr2013'

 src/config/geoip-manual |   71 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 63 insertions(+), 8 deletions(-)