commit cb90defba6f16ac96578a6b88c2c3d384a7748ee Merge: e81896add 86e6cb640 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/consdiffmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)