Merge branch 'prop140_21643_diff_only_squashed'

diff --cc src/common/log.c
Simple merge

diff --cc src/common/torlog.h
Simple merge

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

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

diff --cc src/test/test.h
Simple merge