commit 630b4af26097e9813505b87532806b9b032a84f4 Merge: 9511522 91ff10f Author: Nick Mathewson nickm@torproject.org Date: Thu May 1 11:30:55 2014 -0400

Merge remote-tracking branch 'andrea/bug11476'

src/or/buffers.c | 6 +++--- src/test/test_buffers.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-)