commit 47982cdc0951b5cdae5b5cc6dbfea33d228f3950 Merge: 0be10dd 1ff98a7 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 10 15:27:16 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket22870 | 5 +++++ src/test/test_consdiff.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-)