Commit 5099d858b1906bad04c531a7c98e2d0877d5e7f8

Nick Mathewson 2011-06-08T14:29:36

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