[Swan-commit] Changes to ref refs/heads/master

[Andrew Cagney]

New commits:
commit 762dd3c1ecf6563f0ffc29c5ecbdf8d2b3685093
Merge: aa9d90f 0cd6461
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jan 7 17:38:39 2019 -0500

    pluto: cleanup stray DBG_log() and s/DBG_MASK/DBG_BASE/
    
    So that enabling cpu-usage doesn't enable random logging.
    
    Merge commit '0cd64615f5888a55b297ad7471f1f834cde81b37'

commit 0cd64615f5888a55b297ad7471f1f834cde81b37
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jan 7 17:37:17 2019 -0500

    server: fix two unconditional DBG_log() calls

commit 1baaf159c8f2433ab7d5ab0686c910732b268dd2
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jan 7 17:30:37 2019 -0500

    selinux: log using libreswan_log() or dbg(), not an unconditional DBG_log() call

commit bf347e220bf8952f11b5912d9492e926b6771653
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jan 7 16:43:34 2019 -0500

    logging: DBG_MASK -> DBG_BASE so that DBG_CPU_USAGE doesn't enable logging

commit 1f2f6de4ba476ffce3afcf2a6a800a6bf2091afd
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jan 7 16:43:03 2019 -0500

    logging: don't add prefix '|' to connection specific log lines

commit 6d691ec918160eb6828d52ffc40f26fb955342f4
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jan 7 16:42:02 2019 -0500

    testing: in ikev2-x509-01-nss-debug set debug=cpu-usage
    
    Since nothing logs using that, there should be no debug lines.
    But there are :-(