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

[nickm@xxxxxxxxxxxxxx]

commit fd1c2a13e7558086732288eb1a4f52aef2edeb2f
Merge: a24f29e 7f805b6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 8 10:37:34 2013 -0500

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

 src/config/geoip-manual |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

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