commit 1625cddf3af74643bdeaa31e7684aaa15bf5ea0c
Merge: 52bf155 32114d7
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Jan 14 14:24:19 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
changes/geoip-jan2013 | 3 +
src/config/geoip |19722 ++++++++++++++++++-------------------------------
2 files changed, 7151 insertions(+), 12574 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
