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

[nickm at torproject.org]

commit 3d7f134bea38b94a2454dcabe0ce6d32dbbd3059
Merge: 6b629d309 e81896add
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 09:50:24 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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