[tor-commits] [tor/master] Merge branch 'bug12971_take2_squashed'

[nickm at torproject.org]

commit 11ebbf5e88a55c15bdec0d16f0f60b24ee747fc9
Merge: 5e8cc76 fcebc8d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 29 09:18:03 2014 -0400

    Merge branch 'bug12971_take2_squashed'

 changes/bug12971      |    5 +++++
 src/or/buffers.c      |   20 ++++++++++++++++++++
 src/test/test_socks.c |   18 ++++++++++++++----
 3 files changed, 39 insertions(+), 4 deletions(-)