Merge branch 'maint-0.2.2' into release-0.2.2

This commit is contained in:
Roger Dingledine 2011-10-27 20:52:54 -04:00
commit f0e1ee98af

Diff Content Not Available