Next/20190826/v4

README.md

@@ -107,7 +107,7 @@ A: To assist in the automation of the QA, we're not accepting warnings or errors
 
 __Q: I think your QA test is wrong__
 
-A: If you really think it is, we can discuss how to improve it. But don't come to this conclusion to quickly, more often it's the code that turns out to be wrong.
+A: If you really think it is, we can discuss how to improve it. But don't come to this conclusion too quickly, more often it's the code that turns out to be wrong.
 
 
 __Q: do you require signing of a contributor license agreement?__

configure.ac

@@ -869,6 +869,8 @@
         exit 1
     fi
 
+    AC_CHECK_FUNCS([pthread_spin_unlock])
+
   # libjansson
     AC_ARG_WITH(libjansson_includes,
             [  --with-libjansson-includes=DIR  libjansson include directory],

doc/userguide/output/custom-tls-logging.rst

@@ -11,7 +11,7 @@ In your Suricata.yaml, find the tls-log section and edit as follows:
       filename: tls.log # File to store TLS logs.
       append: yes
       custom: yes       # enabled the custom logging format (defined by customformat)
-      customformat: "%{%D-%H:%M:%S}t.%z %a:%p -> %A:%P %n %n %d %D"
+      customformat: "%{%D-%H:%M:%S}t.%z %a:%p -> %A:%P %v %n %d %D"
 
 And in your tls.log file you would get the following, for example:
 

doc/userguide/rules/ja3-keywords.rst

@@ -5,6 +5,8 @@ Suricata comes with a JA3 integration (https://github.com/salesforce/ja3). JA3 i
 
 JA3 must be enabled in the Suricata config file (set 'app-layer.protocols.tls.ja3-fingerprints' to 'yes').
 
+JA3 also requires Suricata to be built with LibNSS support.
+
 ja3.hash
 --------