Feature/12919

I tested it with fteproxy and it worked as expected
Ticket link: https://trac.torproject.org/projects/tor/ticket/12919
ciao