commit 857e210b7d4939cf32d7d519b8b4d739d0b23f43 Merge: 96c5ac338 8a81a7087 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 26 13:52:16 2018 -0400

Merge branch 'ticket25931'

changes/ticket25931 | 9 +++++++++ src/or/consdiffmgr.c | 33 +++++++++++++++++++++++++++++++-- src/or/main.c | 6 ------ 3 files changed, 40 insertions(+), 8 deletions(-)