Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pk11wrap/pk11load.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * The following handles the loading, unloading and management of
  * various PCKS #11 modules
  */
 #define FORCE_PR_LOG 1
 #include "seccomon.h"
 #include "pkcs11.h"
@@ skipping 604 matching lines @@
     
     /* do we want the semantics to allow unloading the internal library?
      * if not, we should change this to SECFailure and move it above the
      * mod->loaded = PR_FALSE; */
     if (mod->internal && (mod->dllName == NULL)) {
 #ifndef NSS_STATIC
         if (0 == PR_ATOMIC_DECREMENT(&softokenLoadCount)) {
           if (softokenLib) {
               disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
               if (!disableUnload) {
+#ifdef DEBUG
                   PRStatus status = PR_UnloadLibrary(softokenLib);
                   PORT_Assert(PR_SUCCESS == status);
+#else
+                  PR_UnloadLibrary(softokenLib);
+#endif
               }
               softokenLib = NULL;
           }
           loadSoftokenOnce = pristineCallOnce;
         }
 #endif
         return SECSuccess;
     }
 
     library = (PRLibrary *)mod->library;
@@ skipping 16 matching lines @@
 
 void
 nss_DumpModuleLog(void)
 {
 #ifdef DEBUG_MODULE
     if (modToDBG) {
         print_final_statistics();
     }
 #endif
 }