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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.1' into release-0.3.1

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