Commit 07b5e45ba53182bf61a3eee6cef57d48ef776111

Nick Mathewson 2014-09-18T15:08:57

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