Commit 99210dd9e0f6c2dfbd53c65854bd317cf13054be

Nick Mathewson 2010-04-09T19:14:25

Merge branch 'comment'