From: Michael Shuler <michael@pbandjelly.org>
Date: Sat, 17 Sep 2011 22:45:51 +0000 (-0500)
Subject: Import Debian version 20110502+nmu1
X-Git-Url: https://git.donarmstrong.com/?p=ca-certificates.git;a=commitdiff_plain;h=9292bd8a8fde22289355b243f631a8fb6fc597e7

Import Debian version 20110502+nmu1
---

diff --git a/debian/changelog b/debian/changelog
index afe9432..552c50e 100644
--- 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.
diff --git a/mozilla/blacklist.txt b/mozilla/blacklist.txt
index 8d57b86..911f9f1 100644
--- a/mozilla/blacklist.txt
+++ b/mozilla/blacklist.txt
@@ -3,3 +3,5 @@
 # MD5 Collision Proof of Concept CA
 "MD5 Collisions Forged Rogue CA 25c3"
 
+# DigiNotar Root CA (see debbug#639744)
+"DigiNotar Root CA"