Commit 2aad8cbb6265e93f9b2a582d6b0f09c8d4e33c24

Nick Mathewson 2012-08-24T11:41:18

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