Merge branch 'buf_for_stringbuffer_squashed'

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

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

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

diff --cc src/or/connection.h
Simple merge

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

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