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