Merge branch 'maint-0.2.2'
commit9625a2e8f5070198f58b3c343e65a3ac99765ede
authorRoger Dingledine <arma@torproject.org>
Wed, 26 Oct 2011 20:36:59 +0000 (26 16:36 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 26 Oct 2011 20:36:59 +0000 (26 16:36 -0400)
tree89c5414768a8300664a0c4596f04f7cfac8cf75f
parentc21c8daaaf9dfc1f3a700e2176fb51e7185d021a
parent41d9d3f90437ae9dbde1590faf0ffc412c68df19
Merge branch 'maint-0.2.2'