Johanna Amann ba3b35a612 Merge remote-tracking branch 'origin/master' into topic/johanna/ssl-resumption		2014-10-21 11:32:46 -07:00
..
frameworks	intel framework plugin for ssl server_name extension was not updated after api changes :(	2014-05-20 08:33:44 -07:00
integration	Add more script package README files	2013-10-22 14:44:59 -05:00
misc	Fix misc/load-balancing.bro's reference to PacketFilter::sampling_filter	2014-05-29 15:40:41 -05:00
protocols	Mark everything below 2048 bit as a weak key (Browsers will stop	2014-08-08 09:26:11 -07:00
tuning	Move DataSeries and ElasticSearch into plugins.	2014-08-08 18:32:21 -07:00