Commit e3d010c8f6a2d91218826e922e16a2f14c59d5c0

Nick Mathewson 2012-08-23T10:13:26

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