[tor-commits] [tor/master] Merge branch 'tor-github/pr/1311'

[dgoulet at torproject.org]

commit 049705fc1c9d1c0cee120dc8cbd1a719c6e45e85
Merge: 3b32f2508 39c7f46d3
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Sep 11 09:36:28 2019 -0400

    Merge branch 'tor-github/pr/1311'

 changes/bug31615                 |  5 +++++
 src/app/main/subsystem_list.c    | 43 ++++++++++++++++++++++------------------
 src/lib/err/torerr_sys.c         |  5 ++++-
 src/lib/log/log_sys.c            |  2 ++
 src/lib/net/network_sys.c        |  4 +++-
 src/lib/process/winprocess_sys.c |  2 ++
 src/lib/thread/compat_threads.c  |  2 ++
 src/lib/time/time_sys.c          |  4 +++-
 src/lib/wallclock/approx_time.c  |  4 +++-
 9 files changed, 48 insertions(+), 23 deletions(-)