Commit e918f15a4c97cd275b7b98c5de844879327a86eb

Nick Mathewson 2011-08-01T10:30:02

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