Merge branch 'bug20894_029_v3'

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/or/buffers.h
Simple merge

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