Commit c53895944dfefd0f8586d2639d400e0ffe956562

Nick Mathewson 2011-03-07T21:59:47

Merge remote branch 'origin/patches-2.0'