commit 5ddb9b3134b30da0c4ae8857bc15ddaa7c29a4b1
Merge: 27ec024 4e7552e
Author: Roger Dingledine <a...@torproject.org>
Date: Fri Jul 6 16:31:40 2012 -0400
Merge branch 'maint-0.2.2' into maint-0.2.3
changes/revert-geoip-may2012 | 6 +
src/config/geoip |35480 ++++++++++++++++++++++++++----------------
2 files changed, 22134 insertions(+), 13352 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
