Commit d8a7853ed0f8bb07fff5f65b0fc111e2ba8e5ee8

Nick Mathewson 2012-03-25T18:56:34

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