commit a5cc5ad08d7d3289a52335b87bea512d50ba8062 Merge: 33b399a c8132aa Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 16 09:12:13 2014 -0400

Merge remote-tracking branch 'yawning/bug13314'

changes/bug13314 | 4 +++ src/or/buffers.c | 11 +++++++- src/test/test_socks.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-)