https://trac.torproject.org/projects/tor/ticket/13187#comment:4
Merge pull request #16 from kpdyer/dev

https://trac.torproject.org/projects/tor/ticket/13187#comment:4