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

[nickm at torproject.org]

commit 7b2364035a6f80fd3158e1b6d7b0034989aefb38
Merge: d730449 1ff98a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 10 15:27:16 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/ticket22870      |  5 +++++
 src/test/test_consdiff.c | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)