[Bug 226114] New: Merge Review: m2crypto