Commit 356720a23bfa9b8d5418c07485e0a7cb66487fc6

Nick Mathewson 2011-05-27T15:09:54

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