commit 558c04f5b119b62f5a6ef00739468b31f65fcc19 Merge: 67eb647 d71fc47 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 30 08:40:46 2017 -0500

Merge branch 'combined-fuzzing-v4'

.gitignore | 4 + Makefile.am | 7 ++ configure.ac | 9 +- doc/HACKING/Fuzzing.md | 120 ++++++++++++++++++ src/common/crypto.c | 15 +-- src/common/crypto.h | 10 +- src/common/crypto_ed25519.c | 22 ++-- src/common/crypto_ed25519.h | 16 ++- src/include.am | 2 +- src/or/buffers.c | 48 ++++++++ src/or/buffers.h | 3 + src/or/directory.c | 16 +-- src/or/directory.h | 13 +- src/or/networkstatus.c | 2 +- src/or/networkstatus.h | 3 +- src/or/routerkeys.c | 12 +- src/or/routerkeys.h | 4 +- src/or/routerparse.c | 37 ++++-- src/or/routerparse.h | 7 +- src/test/fuzz/dict/consensus | 52 ++++++++ src/test/fuzz/dict/descriptor | 41 +++++++ src/test/fuzz/dict/extrainfo | 32 +++++ src/test/fuzz/dict/hsdescv2 | 8 ++ src/test/fuzz/dict/http | 24 ++++ src/test/fuzz/dict/iptsv2 | 6 + src/test/fuzz/dict/microdesc | 7 ++ src/test/fuzz/fixup_filenames.sh | 19 +++ src/test/fuzz/fuzz_consensus.c | 78 ++++++++++++ src/test/fuzz/fuzz_descriptor.c | 79 ++++++++++++ src/test/fuzz/fuzz_extrainfo.c | 65 ++++++++++ src/test/fuzz/fuzz_hsdescv2.c | 52 ++++++++ src/test/fuzz/fuzz_http.c | 133 ++++++++++++++++++++ src/test/fuzz/fuzz_iptsv2.c | 46 +++++++ src/test/fuzz/fuzz_microdesc.c | 47 +++++++ src/test/fuzz/fuzz_multi.sh | 34 ++++++ src/test/fuzz/fuzz_vrs.c | 80 ++++++++++++ src/test/fuzz/fuzzing.h | 13 ++ src/test/fuzz/fuzzing_common.c | 190 +++++++++++++++++++++++++++++ src/test/fuzz/include.am | 250 ++++++++++++++++++++++++++++++++++++++ src/test/fuzz/minimize.sh | 14 +++ src/test/fuzz_static_testcases.sh | 27 ++++ src/test/include.am | 4 +- 42 files changed, 1588 insertions(+), 63 deletions(-)