[patch] Backport proposed generate_dhparams fix