Merge branch 'maint-0.2.2'
commit108f48dfc7f1b6bdace9b859e01dbab79aeff071
authorRoger Dingledine <arma@torproject.org>
Tue, 22 Feb 2011 19:44:32 +0000 (22 14:44 -0500)
committerRoger Dingledine <arma@torproject.org>
Tue, 22 Feb 2011 19:44:32 +0000 (22 14:44 -0500)
tree0cb724a34f286011e857d72a566a9d010bc1948c
parent2eadbd41f0d0356898c75d7fab032109a85bc9e9
parent4f730e4f3f39748e214470357e3d7aff407fe7e0
Merge branch 'maint-0.2.2'