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

[nickm at torproject.org]

commit 8b162443b91b12e876d94282f1d5d6e0d519cb95
Merge: 69e242f84 cb90defba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 10:01:13 2018 -0500

    Merge branch 'maint-0.3.2'

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