Commit b163fdaad11bd1a4efec09a33329529e111ba4fa

Nick Mathewson 2014-03-26T11:10:16

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