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

[nickm at torproject.org]

commit 57859980a83991d08d98f450b5e5f87762e9f3f6
Merge: 3892e03 e7361aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 16 12:48:49 2013 -0400

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

 src/config/geoip-manual |   85 -----------------------------------------------
 1 file changed, 85 deletions(-)