commit d83d1c7a890eea5dca8c9db9c8b9b75ad2fa8f1a Merge: 76b73013e 86e6cb640 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 31 10:01:13 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

src/or/consdiffmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)