Merge branch 'master' into topic/jsiwek/faf-updates

Conflicts:
	magic

testing/scripts/diff-canonifier-external

@@ -2,10 +2,17 @@
 #
 # Default canonifier used with the trace-based tests in testing/external/*.
 
+addl="cat"
+
+if [ "$1" == "capture_loss.log" ]; then
+    addl="`dirname $0`/diff-remove-fractions"
+fi
+
 `dirname $0`/diff-remove-timestamps \
     | `dirname $0`/diff-remove-uids \
     | `dirname $0`/diff-remove-file-ids \
     | `dirname $0`/diff-remove-x509-names \
     | `dirname $0`/diff-canon-notice-policy \
-    | `dirname $0`/diff-sort
+    | `dirname $0`/diff-sort \
+    | eval $addl
 

testing/scripts/diff-remove-fractions

@@ -0,0 +1,6 @@
+#! /usr/bin/env bash
+#
+# Replace fractions of double value (i.e., 3.14 -> 3.x).
+
+sed 's/\.[0-9]\{1,\}/.X/g'
+