[or-cvs] [tor/master] Merge branch 'maint-0.2.2'
arma at torproject.org
arma at torproject.org
Tue Feb 8 03:21:37 UTC 2011
commit 4b6b398cff0c077fc09c19d719971ca58ae1329d
Merge: 3bcba6d 54ccc80
Author: Roger Dingledine <arma at torproject.org>
Date: Mon Feb 7 22:21:01 2011 -0500
Merge branch 'maint-0.2.2'
changes/geoip-feb2011 | 3 +
src/config/geoip | 5232 ++++++++++++++++++++++++++++++++-----------------
2 files changed, 3413 insertions(+), 1822 deletions(-)
More information about the tor-commits
mailing list