Commit ea30a4358cd85e56f4897db77350c4e9ea2fd5ae

Nick Mathewson 2012-01-24T15:30:51

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