commit ca1f18c159fe2c46b32daf86334689afe2db4f94 Merge: 014abf86e 2b825a1a2 Author: David Goulet dgoulet@torproject.org Date: Wed Oct 2 14:15:31 2019 -0400

Merge branch 'tor-github/pr/1385'

changes/bug31898 | 4 ++++ src/lib/dispatch/.may_include | 1 + src/lib/dispatch/dispatch_cfg.h | 6 ++++++ src/lib/dispatch/dispatch_new.c | 12 +++++++----- src/test/test_dispatch.c | 29 +++++++++++++++++++++++++++++ 5 files changed, 47 insertions(+), 5 deletions(-)