Commit 981aa0efc98bb19e0c1ec0889046ac6df056441e

Nick Mathewson 2012-05-03T16:37:39

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