Commit c629e182876620dc14919bb97c231b00e257e2bf

Nick Mathewson 2011-07-15T10:20:58

Merge remote-tracking branch 'origin/patches-2.0'