Commit 6b23518d850a499db5e16c275445b0243f38379d

Nick Mathewson 2011-05-06T11:06:11

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