Commit 29e5f7ea1bcc05b8505860ae5f6c6c0e4ac2563a

Nick Mathewson 2011-05-26T17:45:54

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