Merge remote-tracking branch 'origin/master' into topic/robin/pktsrc

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

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

VERSION

@@ -1 +1 @@
-2.3-134
+2.3-136

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
-<http://www.bro.org/documentation/faq.html>`_ if you are having
+<//www.bro.org/documentation/faq.html>`_ if you are having
 problems installing Bro.
 
 Finally, if you want to build the Bro documentation (not required, because

doc/quickstart/index.rst

@@ -1,5 +1,5 @@
 
-.. _FAQ: http://www.bro.org/documentation/faq.html
+.. _FAQ: //www.bro.org/documentation/faq.html
 
 .. _quickstart:
 

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);