Commit 93defa2ffc35c38980dd263bb84c0fd1f9bd7c1d

Nick Mathewson 2012-04-03T09:52:40

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