[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 69e242f845fa53ee0930127dc9dccae8ca5c70e8
Merge: 914ec372a e81896add
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 09:50:24 2018 -0500

    Merge branch 'maint-0.3.2'

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