Merge branch 'maint-0.2.2'

This commit is contained in:
Roger Dingledine 2011-07-06 00:49:11 -04:00
commit ab8c0d4c9e