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

[nickm at torproject.org]

commit 9bfb6fe3958240172f1133e918d1fc6bd5732532
Merge: cb90defba 5fc0437e7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 10:06:49 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

 src/or/consdiffmgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)