Nick Mathewson: Make sure the recursion is handled properly.

This is part of SF patch #440292.