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

https://trac.torproject.org/projects/tor/ticket/13187