Commit cac02fadc27e9e164d0ab1499f3338d05f72a16f

Nick Mathewson 2011-12-08T14:38:04

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