Merge remote branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-03-09 16:22:50 -05:00
commit 92e607d951

Diff Content Not Available