Commit d4f56353f7fad75cb6e7d8dcdee222a510dcffe1

Nick Mathewson 2011-08-10T13:18:30

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