commit 08cd7a1bf29596aa51290ed00cd21d9247daabef Merge: f2027d5bf d416e208e Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 28 07:50:47 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bugs_25036_25055 | 7 +++++ src/common/util.c | 72 ++++++++++++++++++++++++++++++++++++++---------- src/common/util.h | 3 +- src/or/proto_socks.c | 4 +-- src/test/test_socks.c | 24 ++++++++++++++-- src/test/test_util.c | 68 +++++++++++++++++++++++++++++++-------------- 6 files changed, 138 insertions(+), 40 deletions(-)