Commit c116d960b710fce90638c783641f10de3753d606

Nick Mathewson 2011-07-04T11:37:52

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