commit b9d8c8b1267ac4b5968b6c165d6aee27814c78aa Merge: dc9ec51 f8c9875 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 22 08:11:36 2017 -0400

Merge remote-tracking branch 'rl1987/bug22461'

changes/bug22461 | 5 +++++ src/or/buffers.c | 12 ++---------- src/test/test_socks.c | 26 ++++++++++++-------------- 3 files changed, 19 insertions(+), 24 deletions(-)