Commit 49efac5356ca4eea4b7e6ef9bf1160bba25cfcde

Nick Mathewson 2014-02-09T13:35:21

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