[geary/gnome-3-34: 2/2] Merge branch 'cherry-pick-cef0aeee' into 'gnome-3-34'

[Michael Gratton <mjog src gnome org>]

commit 4fedc3e17f472b1c2a87f42e9666fcbed9e3eb5a
Merge: 1b4d8dc7 8eaaa108
Author: Michael Gratton <mike vee net>
Date:   Sun Oct 6 09:36:21 2019 +0000

    Merge branch 'cherry-pick-cef0aeee' into 'gnome-3-34'
    
    Merge branch 'mjog/579-logging-deadlock' into 'gnome-3-34'
    
    See merge request GNOME/geary!324

 src/engine/api/geary-logging.vala | 70 +++++++++++++++++++++++++++++----------
 1 file changed, 52 insertions(+), 18 deletions(-)
---