commit 76b73013e29661a55cbee098c5326b57d3ec6069 Merge: 0e0baad5e 9c2bc441f Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 31 09:50:24 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug24859 | 4 ++++ src/or/consdiffmgr.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)