commit e969d9c6b4b82178fbc840e3d53e12cbb64fee5c Merge: 5a22b42c3 c8b8b15f0 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 17 16:41:01 2018 -0500

Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged

.appveyor.yml | 2 + .gitignore | 4 +- 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 | 5 +- src/lib/process/include.am | 8 +- src/lib/process/process.c | 797 +++++++++++++++++++++++++ src/lib/process/process.h | 142 +++++ src/lib/process/process_unix.c | 704 ++++++++++++++++++++++ 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 | 332 +++++++++++ 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 ------------- 38 files changed, 4324 insertions(+), 2352 deletions(-)

diff --cc src/app/main/main.c index 3f4e1d06a,15b6b48ff..51113cd53 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@@ -71,9 -71,9 +71,10 @@@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_s2k.h" #include "lib/geoip/geoip.h" +#include "lib/net/resolve.h"

#include "lib/process/waitpid.h" + #include "lib/process/process.h"

#include "lib/meminfo/meminfo.h" #include "lib/osinfo/uname.h" diff --cc src/lib/process/.may_include index 3a5d849fe,b1c50c24a..2e90f4d8d --- a/src/lib/process/.may_include +++ b/src/lib/process/.may_include @@@ -15,4 -16,4 +16,4 @@@ lib/subsys/*. lib/testsupport/*.h lib/thread/*.h

- ext/ht.h -ht.h ++ext/ht.h diff --cc src/test/test_util.c index 2b4d64e42,a94153f2d..b983cbb0b --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -10,10 -10,10 +10,10 @@@ #define UTIL_PRIVATE #define UTIL_MALLOC_PRIVATE #define SOCKET_PRIVATE - #define SUBPROCESS_PRIVATE + #define PROCESS_WIN32_PRIVATE #include "lib/testsupport/testsupport.h" #include "core/or/or.h" -#include "lib/container/buffers.h" +#include "lib/buf/buffers.h" #include "app/config/config.h" #include "feature/control/control.h" #include "feature/client/transports.h"