commit da1d900d3003e4db86b57b0ea747aa058545d438 Merge: a2f666aa2 4c8af10f0 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 22 12:08:53 2019 -0400
Merge branch 'maint-0.4.1' into release-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(-)