[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/397'

[nickm at torproject.org]

commit 982829650c59d6807e8c720028c9d766d69cb57c
Merge: ec2094a76e d2256fe9ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 14 13:05:03 2021 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/397'

 Makefile.am                           | 2 +-
 changes/bug40407                      | 5 +++++
 scripts/codegen/fuzzing_include_am.py | 7 ++-----
 src/test/fuzz/include.am              | 5 ++---
 4 files changed, 10 insertions(+), 9 deletions(-)