Just tried the patch from message #133 and it worked against 3.2.9 as well as 3.3.0-rc6 (master as of the time I cloned earlier today) with no other modifications to the instructions contained in that message. The patch appears to be holding up, after at least two successful rekeyings the connection continued to remain active.
Thanks! Shawn "prjktdtnt" Thompson
