Fix for https://trac.torproject.org/projects/tor/ticket/13187#comment:10
Merge pull request #20 from kpdyer/dev

Fix for https://trac.torproject.org/projects/tor/ticket/13187#comment:10