commit 4afc6b172a8984aad0954dd38d44dede6d007c51 Merge: 91be6a77e 5200df855 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 12 11:07:38 2018 -0500

Merge branch 'ticket28755_v2_squashed'

scripts/codegen/fuzzing_include_am.py | 5 +- src/lib/encoding/.may_include | 1 + src/lib/encoding/include.am | 2 + src/lib/encoding/kvline.c | 239 ++++++++++++++++++++++++++++++++ src/lib/encoding/kvline.h | 24 ++++ src/test/fuzz/fuzz_strops.c | 247 ++++++++++++++++++++++++++++++++++ src/test/fuzz/include.am | 29 ++++ src/test/test_config.c | 78 +++++++++++ 8 files changed, 623 insertions(+), 2 deletions(-)