commit afef059795ccdb2157709667614a3741b583e9ba Merge: dae1242 c276c10 Author: Nick Mathewson nickm@torproject.org Date: Mon May 15 17:26:47 2017 -0400

Merge remote-tracking branch 'public/prop140_aftermath_cfg'

src/or/consdiffmgr.c | 25 +++++++++++++++++++++---- src/or/consdiffmgr.h | 1 - src/or/directory.c | 24 ++++++++++++++++++++---- src/test/test_consdiffmgr.c | 2 +- 4 files changed, 42 insertions(+), 10 deletions(-)