Commit 95f70166df3bc9c0817ef98aa3711564300d5bb3

Nick Mathewson 2011-05-25T21:20:31

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