Commit 7c46d4aa63a9cc2b2e011c716c50049bd2da21ce

Nick Mathewson 2012-02-02T11:41:37

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