[tor-commits] [tor/maint-0.3.2] Merge branch 'bug24086_031' into maint-0.3.1

[nickm at torproject.org]

commit f7b41bcdf0d8d3c7ac289d0cb5551988e6ff6b85
Merge: 828333e38 68c21860e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:49:01 2017 -0500

    Merge branch 'bug24086_031' into maint-0.3.1

 changes/bug24086     |  7 +++++++
 src/or/consdiffmgr.c | 13 +++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)