commit 4c8af10f0ea1a7f634806e6870d4c93b947ecb13 Merge: 2318bb237 2b825a1a2 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 22 12:08:46 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1 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(-)