Commit 904254f975b260b2a00b299a01db26b4f81407a3

Nick Mathewson 2011-08-28T14:51:36

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