Commit 2d9154601e5d2a7a2142ba3d1d9cf1cb7c70b2ee

Nick Mathewson 2012-02-10T18:50:17

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