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

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