commit 4b36f9676db4ca98101c26ba5fc539ed458ae571 Merge: bca25eebf 790150e57 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 8 08:19:31 2019 -0500

Merge remote-tracking branch 'tor-github/pr/670' into 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(-)