commit c9b4ddc882c93984359172e3e50f785080751558 Merge: 4bfc35579 44388757c Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jan 18 08:13:48 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)