Update NSS to NSS 3.13.5 (from NSS 3.13.3).

nss/mozilla/security/nss/lib/pk11wrap/pk11merge.c

 /*
  * Merge the source token into the target token.
  */
 
 #include "secmod.h"
 #include "secmodi.h"
 #include "secmodti.h"
 #include "pk11pub.h"
 #include "pk11priv.h"
 #include "pkcs11.h"
@@ skipping 1091 matching lines @@
         /* a matching trust record already exists, merge it in */
         CK_ATTRIBUTE_TYPE trustAttrs[] = {
             CKA_TRUST_SERVER_AUTH, CKA_TRUST_CLIENT_AUTH,
             CKA_TRUST_CODE_SIGNING, CKA_TRUST_EMAIL_PROTECTION, 
             CKA_TRUST_IPSEC_TUNNEL, CKA_TRUST_IPSEC_USER, 
             CKA_TRUST_TIME_STAMPING
         };
         CK_ULONG trustAttrsCount = 
                 sizeof(trustAttrs)/sizeof(trustAttrs[0]);
 
-        int i;
+        CK_ULONG i;
         CK_ATTRIBUTE targetTemplate, sourceTemplate;
 
         /* existing trust record, merge the two together */
         for (i=0; i < trustAttrsCount; i++) {
             targetTemplate.type = sourceTemplate.type = trustAttrs[i];
             targetTemplate.pValue = sourceTemplate.pValue = NULL;
             targetTemplate.ulValueLen = sourceTemplate.ulValueLen = 0;
             PK11_GetAttributes(arena, sourceSlot, id, &sourceTemplate, 1);
             PK11_GetAttributes(arena, targetSlot, targetTrustID, 
                                                         &targetTemplate, 1);
@@ skipping 281 matching lines @@
     return log;
 }
 
 void
 PK11_DestroyMergeLog(PK11MergeLog *log)
 {
    if (log && log->arena) {
         PORT_FreeArena(log->arena, PR_FALSE);
     }
 }