Commit 01b65ab8729bb86fc973661b94f43176e61f61da

Nick Mathewson 2012-07-17T11:10:44

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