[tor-commits] [tor/release-0.3.3] Merge branch 'bugs25036_25055_clean_033' into maint-0.3.3
nickm at torproject.org
nickm at torproject.org
Wed Mar 28 11:50:56 UTC 2018
commit d416e208e4e94c2b4ccd4e11013151c72180faff
Merge: ddee28a3c d4bf1f6c8
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Mar 28 07:49:34 2018 -0400
Merge branch 'bugs25036_25055_clean_033' into maint-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(-)
More information about the tor-commits
mailing list