Commit 364c110687a7fc3e1fa0c6c197c1d0d937ba9131

Nick Mathewson 2014-09-18T12:12:36

Fix for a677b72bd6d9d378daf9775966aa8ca574e26e67