Commit 8b0afe96eb3436bfa286a1fb2059f137458139b7

Nick Mathewson 2011-01-12T21:41:58

Merge remote branch 'origin/patches-2.0'