Import Debian version 20110502+nmu1

diff --git a/debian/changelog b/debian/changelog
index afe9432a7280a441d96e43a2813dff13026bf12b..552c50e52c357d92580998136f5c0680dec34300 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ca-certificates (20110502+nmu1) unstable; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Blacklist "DigiNotar Root CA" (Closes: #639744)
+
+ -- Raphael Geissert <geissert@debian.org>  Tue, 30 Aug 2011 21:00:55 -0500
+

 ca-certificates (20110502) unstable; urgency=low
 
   * QA upload.
 ca-certificates (20110502) unstable; urgency=low
 
   * QA upload.

diff --git a/mozilla/blacklist.txt b/mozilla/blacklist.txt
index 8d57b866349525a8108928cba976e8660cecd273..911f9f14f10b34f58cdd1ce68270a337f86588fa 100644 (file)
--- a/mozilla/blacklist.txt
+++ b/mozilla/blacklist.txt
@@ -3,3 +3,5 @@
 # MD5 Collision Proof of Concept CA
 "MD5 Collisions Forged Rogue CA 25c3"
 
 # MD5 Collision Proof of Concept CA
 "MD5 Collisions Forged Rogue CA 25c3"
 

+# DigiNotar Root CA (see debbug#639744)
+"DigiNotar Root CA"