This is an "ours" merge; we want a separate fix for this bug (bug7191) in master. Rather than catching the two failing cases, we need to make them not fail.
Nick Mathewson