Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nspr/pr/include/prtime.h

Index: nspr/pr/include/prtime.h
diff --git a/nspr/pr/include/prtime.h b/nspr/pr/include/prtime.h
index 732990edb8f3656fd170bfb443f53fedb8c61af7..caaee14f0acd78a14aca6d6507b9aee41cc007fa 100644
--- a/nspr/pr/include/prtime.h
+++ b/nspr/pr/include/prtime.h
@@ -248,14 +248,14 @@ NSPR_API(PRStatus) PR_ParseTimeString (
 
 /* Format a time value into a buffer. Same semantics as strftime() */
 NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt,
-                                           const PRExplodedTime *tm);
+                                 const PRExplodedTime *time);
 
-/* Format a time value into a buffer. Time is always in US English format, regardless
- * of locale setting.
+/* Format a time value into a buffer. Time is always in US English format,
+ * regardless of locale setting.
  */
 NSPR_API(PRUint32)
-PR_FormatTimeUSEnglish( char* buf, PRUint32 bufSize,
-                        const char* format, const PRExplodedTime* tm );
+PR_FormatTimeUSEnglish(char *buf, PRUint32 bufSize,
+                       const char *format, const PRExplodedTime *time);
 
 PR_END_EXTERN_C