[tor-commits] [tor/master] Merge remote-tracking branches 'sebastian/consdiff_add' and 'sebastian/consdiff_newline'

[nickm at torproject.org]

commit eeb266c1395e582f1480f49316a5014ac77e8f50
Merge: 4596435 5a7e39c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 18 21:31:53 2017 -0400

    Merge remote-tracking branches 'sebastian/consdiff_add' and 'sebastian/consdiff_newline'

 src/or/consdiff.c        |  2 +-
 src/test/test_consdiff.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)