Commit 173509d9b679fe536149682e3065485a194d9edb

Nick Mathewson 2011-05-23T18:25:05

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