Commit 22d50db805279d32f74bf9bb28ea44d112c4659d

Nick Mathewson 2011-05-02T23:22:34

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