Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/base/tracker.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/. */
 
 /*
  * tracker.c
  * 
  * This file contains the code used by the pointer-tracking calls used
  * in the debug builds to catch bad pointers.  The entire contents are
  * only available in debug builds (both internal and external builds).
@@ skipping 11 matching lines @@
  * It merely returns the value of the object pointer as its hash.
  * There are no possible errors.
  */
 
 static PLHashNumber PR_CALLBACK
 identity_hash
 (
   const void *key
 )
 {
-  return (PLHashNumber)key;
+  return (PLHashNumber)((char *)key - (char *)NULL);
 }
 
 /*
  * trackerOnceFunc
  *
  * This function is called once, using the nssCallOnce function above.
  * It creates a new pointer tracker object; initialising its hash
  * table and protective lock.
  */
 
@@ skipping 359 matching lines @@
 
   if( (void *)NULL == check ) {
     nss_SetError(NSS_ERROR_POINTER_NOT_REGISTERED);
     return PR_FAILURE;
   }
 
   return PR_SUCCESS;
 }
 
 #endif /* DEBUG */