summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/palemoon/branding/official/default16.pngbin767 -> 836 bytes
-rw-r--r--application/palemoon/branding/official/firefox.icnsbin251912 -> 251915 bytes
-rw-r--r--application/palemoon/branding/official/firefox.icobin101320 -> 101320 bytes
-rw-r--r--application/palemoon/branding/shared/pref/uaoverrides.inc2
-rw-r--r--application/palemoon/config/version.txt2
-rw-r--r--security/nss/lib/softoken/sftkpwd.c4
6 files changed, 4 insertions, 4 deletions
diff --git a/application/palemoon/branding/official/default16.png b/application/palemoon/branding/official/default16.png
index a2e8b1a01..d76bb6fad 100644
--- a/application/palemoon/branding/official/default16.png
+++ b/application/palemoon/branding/official/default16.png
Binary files differ
diff --git a/application/palemoon/branding/official/firefox.icns b/application/palemoon/branding/official/firefox.icns
index 64f17ff62..d63c656c7 100644
--- a/application/palemoon/branding/official/firefox.icns
+++ b/application/palemoon/branding/official/firefox.icns
Binary files differ
diff --git a/application/palemoon/branding/official/firefox.ico b/application/palemoon/branding/official/firefox.ico
index 0d142c5f1..43c5d9343 100644
--- a/application/palemoon/branding/official/firefox.ico
+++ b/application/palemoon/branding/official/firefox.ico
Binary files differ
diff --git a/application/palemoon/branding/shared/pref/uaoverrides.inc b/application/palemoon/branding/shared/pref/uaoverrides.inc
index 36a0ae145..487d083a9 100644
--- a/application/palemoon/branding/shared/pref/uaoverrides.inc
+++ b/application/palemoon/branding/shared/pref/uaoverrides.inc
@@ -76,7 +76,7 @@ pref("@GUAO_PREF@.netflix.com","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Fire
pref("@GUAO_PREF@.netflximg.net","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9");
// UA-sniffing domains that are "app/vendor-specific" and do not like Pale Moon
-pref("@GUAO_PREF@.web.whatsapp.com","Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36");
+pref("@GUAO_PREF@.web.whatsapp.com","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36");
// The following domains do not like the Goanna slice
pref("@GUAO_PREF@.hitbox.tv","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt
index bcbf0fd12..ff225a990 100644
--- a/application/palemoon/config/version.txt
+++ b/application/palemoon/config/version.txt
@@ -1 +1 @@
-28.6.0a1 \ No newline at end of file
+28.7.0a1 \ No newline at end of file
diff --git a/security/nss/lib/softoken/sftkpwd.c b/security/nss/lib/softoken/sftkpwd.c
index 745e724f0..b6d098a07 100644
--- a/security/nss/lib/softoken/sftkpwd.c
+++ b/security/nss/lib/softoken/sftkpwd.c
@@ -36,9 +36,9 @@
const int NSS_DEFAULT_ITERATION_COUNT =
#ifdef DEBUG
- 1000
+ 25
#else
- 60000
+ 500
#endif
;