[glib: 6/6] Merge branch 'gmain-tsan' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 6375476743f922b5fb7b8bc1dffe0b47257ef750
Merge: 9e5a8ba22 dd36cf3a8
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Nov 13 16:04:12 2018 +0000

    Merge branch 'gmain-tsan' into 'master'
    
    gmain: Fix data races in GUnixSignalWatchSource and GChildWatchSource
    
    See merge request GNOME/glib!446

 glib/gmain.c      | 34 +++++++++++++++-------------------
 glib/tests/unix.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 19 deletions(-)
---