diff --git a/CHANGES b/CHANGES index b1c5f03a1f..6979c9d1f5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.3-136 | 2014-09-07 20:50:46 -0700 + + * Change more http links to https. (Johanna Amann) + 2.3-134 | 2014-09-04 16:16:36 -0700 * Fixed a number of issues with OCSP reply validation. Addresses diff --git a/NEWS b/NEWS index f06115d4ea..6da13833c3 100644 --- a/NEWS +++ b/NEWS @@ -22,7 +22,7 @@ New Functionality plugin can furthermore hook into Bro's processing a number of places to add custom logic. - See http://www.bro.org/sphinx-git/devel/plugins.html for more + See https://www.bro.org/sphinx-git/devel/plugins.html for more information on writing plugins. Changed Functionality diff --git a/VERSION b/VERSION index 0154ba2563..8671300356 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-134 +2.3-136 diff --git a/doc/install/install.rst b/doc/install/install.rst index 9a258773ce..0052acafb0 100644 --- a/doc/install/install.rst +++ b/doc/install/install.rst @@ -180,7 +180,7 @@ automatically. Finally, use ``make install-aux`` to install some of the other programs that are in the ``aux/bro-aux`` directory. OpenBSD users, please see our `FAQ -`_ if you are having +`_ if you are having problems installing Bro. Finally, if you want to build the Bro documentation (not required, because diff --git a/doc/quickstart/index.rst b/doc/quickstart/index.rst index 173373c769..bb642ee75a 100644 --- a/doc/quickstart/index.rst +++ b/doc/quickstart/index.rst @@ -1,5 +1,5 @@ -.. _FAQ: http://www.bro.org/documentation/faq.html +.. _FAQ: //www.bro.org/documentation/faq.html .. _quickstart: diff --git a/src/iosource/pcap/Source.h b/src/iosource/pcap/Source.h index b914dc6b63..f627e30afa 100644 --- a/src/iosource/pcap/Source.h +++ b/src/iosource/pcap/Source.h @@ -10,9 +10,7 @@ namespace pcap { class PcapSource : public iosource::PktSrc { public: - // XXX PcapSource(const std::string& path, bool is_live); - virtual ~PcapSource(); static PktSrc* Instantiate(const std::string& path, bool is_live);