Commit 677f23cc22b8356184d012206105433bcd75ae6e

Nick Mathewson 2012-01-20T11:40:39

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