commit f406b9df0533c9730b4537b39f3a7f8d232f3558 Merge: af8cadf3a 4bb831e08 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 18 08:13:45 2018 -0500

Merge branch 'bug24826_031' into maint-0.3.1

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