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

[nickm at torproject.org]

commit b7567a6282e0bca38f4412ce0d571445a0ceda50
Merge: 9ba10d7 eb14faa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 24 11:02:22 2017 -0400

    Merge branch 'consdiffmgr_squashed'

 src/common/confline.c       |   18 +
 src/common/confline.h       |    2 +
 src/common/workqueue.h      |    2 +-
 src/or/conscache.c          |   19 +-
 src/or/conscache.h          |    4 +
 src/or/consdiffmgr.c        | 1116 +++++++++++++++++++++++++++++++++++++++++++
 src/or/consdiffmgr.h        |   48 ++
 src/or/cpuworker.c          |   14 +
 src/or/cpuworker.h          |    6 +
 src/or/include.am           |    2 +
 src/test/include.am         |    1 +
 src/test/test.c             |    1 +
 src/test/test.h             |    1 +
 src/test/test_conscache.c   |    7 +-
 src/test/test_consdiffmgr.c |  883 ++++++++++++++++++++++++++++++++++
 15 files changed, 2114 insertions(+), 10 deletions(-)