Commit c149a1a5e74a17febd6c0bf9af00b80104a5c3ed

Nick Mathewson 2013-08-13T11:14:11

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