Commit d992d911a61814fdf93e68f2c47d481ab535a76b

Nick Mathewson 2012-04-20T11:51:33

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