Merge branch 'maint-0.2.2'
commit1587e0d47061fbdb5e53730172231765fdd351c9
authorRoger Dingledine <arma@torproject.org>
Mon, 4 Apr 2011 07:54:03 +0000 (4 03:54 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 4 Apr 2011 07:54:03 +0000 (4 03:54 -0400)
tree39b660577ebc7638726b5cd96f318052ee66ecb9
parentee871e7a0e9ce9b1df8b8f4add06e8c193b9544a
parent9d2b3849b2052bc6b54028c658a8b27fae452ea4
Merge branch 'maint-0.2.2'