Commit 83fb674a75653adae863e1451d2327db58ff8a5f

Nick Mathewson 2011-02-25T10:42:58

Merge remote branch 'origin/patches-2.0'