Commit 8896a92b0754dfeb02f9fe761ecb0ba2649cde77

Nick Mathewson 2014-03-03T13:47:21

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