Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-05-03 16:46:28 -04:00
commit 97a55b8089

Diff Content Not Available