Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pki/tdcache.c

Index: nss/lib/pki/tdcache.c
diff --git a/nss/lib/pki/tdcache.c b/nss/lib/pki/tdcache.c
index 7842189ca7e6693a4d0de9aaa0795d25471a4fbd..5f9dfdd5c20481237a815278d8992b3f342d87e1 100644
--- a/nss/lib/pki/tdcache.c
+++ b/nss/lib/pki/tdcache.c
@@ -329,7 +329,7 @@ nssTrustDomain_RemoveCertFromCacheLOCKED (
     nssList *subjectList;
     cache_entry *ce;
     NSSArena *arena;
-    NSSUTF8 *nickname;
+    NSSUTF8 *nickname = NULL;
 
 #ifdef DEBUG_CACHE
     log_cert_ref("attempt to remove cert", cert);
@@ -776,14 +776,18 @@ add_cert_to_cache (
     added++;
     /* If a new subject entry was created, also need nickname and/or email */
     if (subjectList != NULL) {
+#ifdef nodef
 	PRBool handle = PR_FALSE;
+#endif
 	if (certNickname) {
 	    nssrv = add_nickname_entry(arena, td->cache, 
 						certNickname, subjectList);
 	    if (nssrv != PR_SUCCESS) {
 		goto loser;
 	    }
+#ifdef nodef
 	    handle = PR_TRUE;
+#endif
 	    added++;
 	}
 	if (cert->email) {
@@ -791,7 +795,9 @@ add_cert_to_cache (
 	    if (nssrv != PR_SUCCESS) {
 		goto loser;
 	    }
+#ifdef nodef
 	    handle = PR_TRUE;
+#endif
 	    added += 2;
 	}
 #ifdef nodef