Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

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

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