Commit 0d10804465ccdbaa2c94efc30f052a4e0391b208

Nick Mathewson 2011-08-18T15:18:14

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