commit 13e93bdfd5a3bc8349723a0e3a9e05f2dd300f99 Merge: cb0d40304 64f594499 Author: David Goulet dgoulet@torproject.org Date: Fri Mar 1 09:36:23 2019 -0500

Merge branch 'tor-github/pr/718'

changes/ticket29542 | 7 +++++++ src/app/main/main.c | 2 +- src/core/mainloop/cpuworker.c | 7 ++----- src/core/or/relay.c | 14 ++------------ src/core/or/relay.h | 3 --- src/lib/crypt_ops/crypto_rand.h | 9 +++++++++ src/lib/evloop/workqueue.c | 10 +--------- 7 files changed, 22 insertions(+), 30 deletions(-)