Merge branch 'writing_tests'

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

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

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

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

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

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