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

[nickm at torproject.org]

commit 44388757c44834d63614c4e13cf88931992afc2a
Merge: 4e653ac2c f406b9df0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 18 08:13:48 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

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