commit 24ba1864d8caa89ee220f6c790b0dd76b466bf4a Merge: 38a13b9 df2bcae Author: Nick Mathewson nickm@torproject.org Date: Thu May 4 08:36:59 2017 -0400

Merge branch 'ticket22143_squashed'

src/or/consdiff.c | 107 ++++++++++++++++++++++++++++++++++++++++---- src/or/consdiff.h | 3 ++ src/or/consdiffmgr.c | 35 ++++++++++++--- src/or/routerparse.c | 58 ++++++++++++++++++++---- src/or/routerparse.h | 5 +++ src/test/fuzz/fuzz_diff.c | 2 + src/test/test_consdiff.c | 34 ++++++++++---- src/test/test_consdiffmgr.c | 31 ++++++------- 8 files changed, 227 insertions(+), 48 deletions(-)