I've got this and all of the fixes necessary for 3.3, default and 2.7 in my local repositories.

odd thing in the 3.2 patch: it is entirely unclear to me if the issue 10309 fix needs to be kept.  i included it as it was missing from 3.2 after previous commits (3.3 and 3.4 still kept it).  2.7 needs it as well.  the other part of the patch is the issue 11729 fix that already exists upstream being reapplied; it was inadvertently undone during the upgrade.

I _could_ push fixes for all branches at once right now unless pushes to 3.2 are blocked and prevent me from pushing anything.

(rant: at which point i declare "hg hell" and feel like giving up because it simply has gotten in the way throughout this entire process rather than helping... i'll be forced to manually create diffs and reapply them to _other_ hg checkouts?  not so useful.  surely someone will stupidly claim i'm holding hg wrong instead of the tool being unhelpful).

We need to GET RID of libffi being bundled as part of the source release in 3.4.  this is disgusting.