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

[nickm at torproject.org]

commit 8dc3b5ff3aa3e78d2834c4ffdaf711d4849e24c3
Merge: da2daa8e5 9bfb6fe39
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 10:06:49 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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