Commit a63ed161864bf5d2fb4c6c72e1ce9bf39d4f368d

Nick Mathewson 2012-02-15T20:26:52

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