Merge branch 'consdiff_numeric_squashed'

diff --cc src/or/consdiff.c
Simple merge

diff --cc src/test/test_consdiff.c
Simple merge