Forked from
The Tor Project / Core / Tor
28167 commits behind the upstream repository.

Nick Mathewson
authored
This is based on shitlei's fix for bug2629, with extra parens removed. Fixes bug 2629, bugfix on 0.2.1.2-alpha.