Requested by Gisle Vanem on tor-dev. I'm not quite sure this is the right solution, but it's probably harmless.