diff --git a/CHANGES b/CHANGES index ff6e283db7..518487152f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -2.2-beta-180 | 2013-11-01 05:03:37 -0700 +2.2-beta-181 | 2013-11-01 05:24:10 -0700 + + * Adding source and original copyright statement to Mozilla cert + list. (Robin Sommer) * Canonfying an intel test to not depend on output order. (Robin Sommer) diff --git a/VERSION b/VERSION index a0f735c7cb..57d7e0aa80 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2-beta-180 +2.2-beta-181 diff --git a/scripts/base/protocols/ssl/mozilla-ca-list.bro b/scripts/base/protocols/ssl/mozilla-ca-list.bro index 75dc057a55..d7c5578166 100644 --- a/scripts/base/protocols/ssl/mozilla-ca-list.bro +++ b/scripts/base/protocols/ssl/mozilla-ca-list.bro @@ -1,5 +1,13 @@ # Don't edit! This file is automatically generated. -# Generated at: Thu Sep 19 12:40:13 -0700 2013 +# Generated at: 2013-11-01 05:23:08 -0700 +# Generated from: http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1 +# +# The original source file comes with this licensing statement: +# +# 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/. + @load base/protocols/ssl module SSL; redef root_certs += {