[tor-commits] [tor/master] Merge branch 'ticket28179_squashed_merged'

[nickm at torproject.org]

commit 872998dd003f0935d8eb83d760d5b8bc17904233
Merge: d3da07701 44a80bb36
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 13:36:34 2018 -0500

    Merge branch 'ticket28179_squashed_merged'

 .appveyor.yml                   |    2 +
 .gitignore                      |    4 +-
 changes/ticket26360             |    4 +
 changes/ticket28179             |    5 +
 changes/ticket28180             |    3 +
 doc/tor.1.txt                   |    3 +-
 src/app/config/config.c         |    2 +-
 src/app/main/main.c             |    6 +
 src/core/mainloop/mainloop.c    |   15 +-
 src/core/mainloop/mainloop.h    |    1 +
 src/feature/client/transports.c |  235 +++++---
 src/feature/client/transports.h |   15 +-
 src/feature/control/control.c   |   11 +
 src/feature/control/control.h   |    4 +-
 src/lib/log/log.c               |    2 +-
 src/lib/log/log.h               |    6 +-
 src/lib/net/buffers_net.c       |  131 ++++-
 src/lib/net/buffers_net.h       |    7 +
 src/lib/process/.may_include    |    6 +-
 src/lib/process/include.am      |    8 +-
 src/lib/process/process.c       |  797 +++++++++++++++++++++++++
 src/lib/process/process.h       |  142 +++++
 src/lib/process/process_unix.c  |  705 ++++++++++++++++++++++
 src/lib/process/process_unix.h  |   68 +++
 src/lib/process/process_win32.c | 1026 ++++++++++++++++++++++++++++++++
 src/lib/process/process_win32.h |   97 +++
 src/lib/process/subprocess.c    | 1236 ---------------------------------------
 src/lib/process/subprocess.h    |  134 -----
 src/test/Makefile.nmake         |    7 +-
 src/test/include.am             |    5 +-
 src/test/test-child.c           |   61 --
 src/test/test-process.c         |   85 +++
 src/test/test.c                 |    1 +
 src/test/test.h                 |    3 +-
 src/test/test_logging.c         |   22 +-
 src/test/test_process.c         |  696 ++++++++++++++++++++++
 src/test/test_process_slow.c    |  342 +++++++++++
 src/test/test_pt.c              |   87 +--
 src/test/test_slow.c            |    2 +-
 src/test/test_util.c            |  318 +---------
 src/test/test_util_slow.c       |  396 -------------
 41 files changed, 4348 insertions(+), 2352 deletions(-)