Commit de69eb7ba944bf4ec7a5ad30396985ca48cb267e

Nick Mathewson 2012-02-10T23:51:11

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