Fixed https://trac.torproject.org/projects/tor/ticket/11755.
Merge pull request #326 from byoogle/11755

Fix for https://trac.torproject.org/projects/tor/ticket/11755