[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit b1ae2fd65ba165722dc121df7bb0be4ec5d6597c
Merge: bfd1d7024 4b36f9676
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 8 08:19:34 2019 -0500

    Merge branch 'maint-0.3.5'

 changes/bug29175_035         |  4 ++++
 src/core/proto/proto_socks.c | 12 ++++++++----
 src/test/test_socks.c        | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)