Commit 5c142a7ee9fbbc9502b71ef3bd034dd908f68089

Nick Mathewson 2014-01-21T14:53:47

Merge remote-tracking branch 'origin/pr/98'