Fixes bug in the main 20347 patch, reported at https://trac.torproject.org/projects/tor/ticket/20347#comment:13