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

[nickm at torproject.org]

commit a6c62cbd13750bf12d72a07e9552ea0e8de0b2b7
Merge: f2e820c45 f923aeee1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 3 08:18:08 2017 -0400

    Merge branch 'bug23678_032'

 changes/bug23678      |  7 +++++++
 src/or/proto_socks.c  | 19 ++++++++++---------
 src/test/test_socks.c |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)