commit ef234ba303a358f956d4c2afded388b54cfc91bc Merge: f608cc0f3 04512d9fc Author: Nick Mathewson nickm@torproject.org Date: Sun Jul 15 17:07:20 2018 -0400

Merge branch 'socks_trunnel4_squashed_merged'

changes/ticket3569_part1 | 6 + scripts/codegen/fuzzing_include_am.py | 1 + src/core/or/socks_request_st.h | 2 + src/core/proto/proto_socks.c | 1127 +++++++--- src/test/fuzz/fuzz_socks.c | 50 + src/test/fuzz/include.am | 25 +- src/test/test_socks.c | 11 +- src/trunnel/include.am | 9 +- src/trunnel/socks5.c | 3978 +++++++++++++++++++++++++++++++++ src/trunnel/socks5.h | 995 +++++++++ src/trunnel/socks5.trunnel | 94 + 11 files changed, 5932 insertions(+), 366 deletions(-)