[tor-commits] [tor/master] Merge branch 'consdiff_numeric_squashed'

[nickm at torproject.org]

commit 9ba10d714a8ae84864c4fe159f4d6780a93d168f
Merge: 8ff2a8c a16de7a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 24 09:33:55 2017 -0400

    Merge branch 'consdiff_numeric_squashed'

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