commit 7a9fb4c0819271cc28f76bdb4867a57e634d3ce8 Merge: 1cc234ed0 4b36f9676 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 8 08:19:34 2019 -0500

Merge branch 'maint-0.3.5' into release-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(-)