[tor-commits] [tor/master] Merge branch 'prop140_21643_diff_only_squashed'

[nickm at torproject.org]

commit 4a4f1e44af0c6aa2a27add9d1e114213a580e50d
Merge: 7505f45 643c907
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 16 14:58:43 2017 -0400

    Merge branch 'prop140_21643_diff_only_squashed'

 src/common/log.c                |    2 +-
 src/common/torlog.h             |    4 +-
 src/or/consdiff.c               | 1301 +++++++++++++++++++++++++++++++++++++++
 src/or/consdiff.h               |   93 +++
 src/or/include.am               |    2 +
 src/test/Makefile.nmake         |    2 +-
 src/test/bench.c                |   22 +
 src/test/fuzz/fuzz_diff.c       |   67 ++
 src/test/fuzz/fuzz_diff_apply.c |   65 ++
 src/test/fuzz/include.am        |   47 +-
 src/test/include.am             |    1 +
 src/test/test.c                 |    1 +
 src/test/test.h                 |    1 +
 src/test/test_consdiff.c        | 1097 +++++++++++++++++++++++++++++++++
 14 files changed, 2701 insertions(+), 4 deletions(-)